BugID: 1000

Created a new version of the CodeLoggingProcessor named LoggingProcessor.
The new LoggingProcessor is based on the new RTDB layer and the new design
for handling runtime-metadata.

MAC/APL/CURTDBDaemons/CURTDBDaemons.spec.in

+# -*- Mode:rpm-spec -*-
+# CURTDBDaemons.spec.in
+#
+
+##############################################################################
+#
+# Preamble
+#
+##############################################################################
+
+Summary: This package contains all daemons that should run on a ControlUnit.
+
+%define release @RPM_RELEASE@
+%define version @VERSION@
+%define pkgname @PACKAGE@
+%define pkgdir %{pkgname}-%{version}-%{release}
+%define prefix /opt/lofar
+%define configure_args @RPM_CONFIGURE_ARGS@
+##define build_kernel_version @BUILD_KERNEL_VERSION@
+
+Name: %{pkgname}
+Version: %{version}
+Release: %{release}
+Copyright: LGPL
+Group: Application/System
+Source: %{pkgname}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{pkgdir}-root
+URL: http://www.astron.nl
+Prefix: %{prefix}
+BuildArchitectures: i386 # Target platforms, i.e., i586
+Requires: Common = 2.3
+Requires: APS = 2.0
+Requires: GCFTM = 6.0
+Requires: GCFCommon = 6.0
+Requires: APLCommon = 3.1
+Packager: %{packager}
+Distribution: The LOFAR project
+Vendor: ASTRON
+
+AutoReqProv: no
+
+%description
+
+This package contains all daemons that should run on a ControlUnit:
+LDStartDaemon that starts Logical Devices.
+ServiceBroker for managing portnumbers on a CU.
+
+##############################################################################
+#
+# prep
+#
+##############################################################################
+%prep
+echo $prefix
+
+# create the build directory, untar the source
+%setup
+
+##############################################################################
+#
+# build
+#
+##############################################################################
+%build
+./configure %{configure_args} --prefix=%{prefix} && make
+
+##############################################################################
+#
+# install
+#
+##############################################################################
+%install
+# To make things work with BUILDROOT
+if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
+then
+  echo
+  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+  echo @                                                                    @
+  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
+  echo @                                                                    @
+  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+  echo
+else
+  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
+  rm -rf "$RPM_BUILD_ROOT"
+fi
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+make DESTDIR="$RPM_BUILD_ROOT" install
+
+#uninstall
+
+##############################################################################
+#
+# verify
+#
+##############################################################################
+#verify
+
+##############################################################################
+#
+# clean
+#
+##############################################################################
+%clean
+# Call me paranoid, but I do not want to be responsible for nuking
+# someone's harddrive!
+if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
+then
+  echo
+  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+  echo @                                                                    @
+  echo @  RPM_BUILD_ROOT is not what I expected.  Please clean it yourself. @
+  echo @                                                                    @
+  echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+  echo
+else
+  echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
+  rm -rf "$RPM_BUILD_ROOT"
+fi
+
+##############################################################################
+#
+# files
+#
+##############################################################################
+
+# empty 'files' means all distributed files
+%files
+%defattr(-, root, root)
+%{prefix}
+
+# Your application file list goes here
+# %{prefix}/lib/lib*.so*
+
+# Documentation
+# doc COPYING ChangeLog README AUTHORS NEWS
+# doc doc/*
+
+# link the module to the correct path
+%post 
+
+# before uninstall
+%preun
+
+# after uninstall
+%postun
+
+##############################################################################
+#
+# package devel
+#
+##############################################################################
+
+#package devel
+#Summary: Development files for %{pkgname}
+#Group: Applications/System
+#description devel
+#Development files for %{pkgname}.
+
+#files devel
+
+# Your development files go here
+# Programmers documentation goes here
+#doc doc
+
+# end of file

MAC/APL/CURTDBDaemons/Makefile.am

+SUBDIRS=src
+
+EXTRA_DIST = \
+      Makefile.common \
+      CUDaemons.spec \
+      autoconf_share/compiletool
+
+include $(top_srcdir)/Makefile.common

MAC/APL/CURTDBDaemons/bootstrap

+#!/bin/sh
+
+../../../autoconf_share/bootstrap ../../../autoconf_share

MAC/APL/CURTDBDaemons/configure.in

+dnl
+dnl Process this file with autoconf to produce a configure script.
+dnl
+AC_INIT
+dnl AC_CONFIG_AUX_DIR(config)
+dnl AM_CONFIG_HEADER(config/config.h)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(CURTDBDaemons, 1.0, no-define)
+
+dnl
+dnl Initialize for LOFAR (may set compilers)
+dnl
+lofar_INIT
+
+dnl Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+AC_PROG_YACC
+AM_PROG_LEX
+
+dnl Checks for libraries.
+
+dnl dnl Replace `main' with a function in -lfl:
+dnl AC_CHECK_LIB(fl, main)
+dnl dnl Replace `main' with a function in -lcosev_r:
+dnl AC_CHECK_LIB(cosev_r, main)
+dnl dnl Replace `main' with a function in -lcosnm_r:
+dnl AC_CHECK_LIB(cosnm_r, main)
+dnl dnl Replace `main' with a function in -lorb_r:
+dnl AC_CHECK_LIB(orb_r, main)
+dnl dnl Replace `main' with a function in -lpthread:
+dnl AC_CHECK_LIB(pthread, main)
+dnl dnl Replace `main' with a function in -lvport_r:
+dnl AC_CHECK_LIB(vport_r, main)
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(unistd.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+
+dnl
+dnl Check for LOFAR specific things
+dnl
+lofar_GENERAL
+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/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,,)
+
+dnl
+dnl Output Makefiles
+dnl
+AC_OUTPUT(
+src/Makefile
+test/Makefile
+src/LoggingProcessor/Makefile
+Makefile
+CURTDBDaemons.spec
+)

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

+//#  LoggingProcessor.cc: Filters and stores logmessages in PVSS
+//#
+//#  Copyright (C) 2007
+//#  ASTRON (Netherlands Foundation for Research in Astronomy)
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//#  This program is free software; you can redistribute it and/or modify
+//#  it under the terms of the GNU General Public License as published by
+//#  the Free Software Foundation; either version 2 of the License, or
+//#  (at your option) any later version.
+//#
+//#  This program is distributed in the hope that it will be useful,
+//#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//#  GNU General Public License for more details.
+//#
+//#  You should have received a copy of the GNU General Public License
+//#  along with this program; if not, write to the Free Software
+//#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//#  $Id$
+
+#include <lofar_config.h>
+#include <Common/LofarLogger.h>
+#include <GCF/GCF_PVTypes.h>
+#include <GCF/GCF_ServiceInfo.h>
+#include <GCF/PVSS/PVSSresult.h>
+#include <log4cplus/socketappender.h>
+#include "LoggingProcessor.h"
+
+using namespace log4cplus;
+using namespace log4cplus::helpers;
+namespace LOFAR {
+  namespace GCF {
+    using namespace Common;
+    using namespace TM;
+    using namespace RTDB;
+    namespace RTDBDaemons {
+
+//
+// CodeloggingProcessor()
+//
+LoggingProcessor::LoggingProcessor(const string&	myName) :
+	GCFTask((State)&LoggingProcessor::initial, myName),
+	itsListener (0),
+	itsDPservice(0),
+	itsTimerPort(0)
+{
+	LOG_DEBUG_STR("LoggingProcessor(" << myName << ")");
+
+	TM::registerProtocol(F_FSM_PROTOCOL, F_FSM_PROTOCOL_STRINGS);
+
+	// initialize the ports
+	itsListener = new GCFTCPPort(*this, "listener", GCFPortInterface::MSPP, 0, true);
+	ASSERTSTR(itsListener, "Can't allocate a listener port");
+	itsListener->setPortNumber(MAC_CODELOGGING_PORT);
+
+	itsDPservice = new DPservice(this, false);
+	ASSERTSTR(itsDPservice, "Can't allocate DataPoint service");
+
+	itsTimerPort = new GCFTimerPort(*this, "timerPort");
+	ASSERTSTR(itsTimerPort, "Can't allocate timer");
+
+}
+
+//
+// ~CodeloggingProcessor()
+//
+LoggingProcessor::~LoggingProcessor()
+{
+	LOG_DEBUG_STR("~LoggingProcessor()");
+	
+	if (itsTimerPort) {	
+		delete itsTimerPort;
+	}
+	if (itsDPservice) {
+		delete itsDPservice;
+	}
+	if (itsListener) {
+		delete itsListener;
+	}
+}
+
+//
+// initial(event, port)
+//
+// Try to open our listener socket
+//
+GCFEvent::TResult LoggingProcessor::initial(GCFEvent& event, GCFPortInterface& port)
+{
+	GCFEvent::TResult status = GCFEvent::HANDLED;
+	switch (event.signal) {
+	case F_INIT:
+		break;
+
+	case F_ENTRY:
+	case F_TIMER:
+		if (!itsListener->isConnected()) {
+			itsListener->open();
+		}
+	break;
+
+	case F_CONNECTED:
+		// We are on the air, go to operational state.
+		TRAN(LoggingProcessor::operational);
+	break;
+
+	case F_DISCONNECTED:
+		port.setTimer(5.0); // try again after 5 second
+	break;
+
+	default:
+		status = GCFEvent::NOT_HANDLED;
+	break;
+	}
+
+	return (status);
+}
+
+//
+// oprational(event, port)
+//
+GCFEvent::TResult LoggingProcessor::operational(GCFEvent&			event, 
+												GCFPortInterface&	port)
+{
+	LOG_DEBUG_STR("operational:" << eventName(event) << "@" << port.getName());
+
+	GCFEvent::TResult status = GCFEvent::HANDLED;
+	static unsigned long garbageTimerID = 0;
+
+	switch (event.signal) {
+	case F_ENTRY:
+		garbageTimerID = itsTimerPort->setTimer(1.0, 5.0); 
+	break;
+
+	// Catch incoming connections of new clients
+	case F_ACCEPT_REQ: {
+		GCFTCPPort*		client(new GCFTCPPort);
+		if (!client) {
+			LOG_ERROR("Can't allocate new socket for new client");
+			return (status);
+		}
+		client->init(*this, "newClient", GCFPortInterface::SPP, 0, true);
+		itsListener->accept(*client);
+	}
+	break;
+
+	case F_CONNECTED:
+	break;
+
+	case F_DISCONNECTED: {
+		ASSERTSTR(itsListener != &port, "Lost listener-port, bailing out"); 
+		LogClientMap::iterator	iter = itsClients.find(&port);
+		if (iter == itsClients.end()) {
+			LOG_INFO("Connection lost to a not-registered LofarLogger client.");
+		}
+		else {
+			LOG_INFO_STR("Closing log-stream to " << iter->second.DPname << ", passed " 
+							<< iter->second.msgCnt << " messages to the database");
+		}
+		port.close();
+	}
+	break;
+
+	case F_CLOSED:
+		itsClients.erase(&port);
+		itsClientsGarbage.push_back(&port);
+	break;
+
+	case F_TIMER: {
+		// cleanup the garbage of closed ports to master clients
+		GCFPortInterface* pPort;
+		for (TClients::iterator iter = itsClientsGarbage.begin();
+			iter != itsClientsGarbage.end(); ++iter) {
+			pPort = *iter;
+			delete pPort;
+		}
+		itsClientsGarbage.clear();
+	}  
+	break;
+
+	case F_DATAIN: {
+		// extract the incoming data to a Logger event object
+		// read message size
+		SocketBuffer msgSizeBuffer(sizeof(unsigned int));
+		if (!_readFromPortData(port, msgSizeBuffer)) {
+			break;
+		}
+
+		// read message
+		unsigned int msgSize = msgSizeBuffer.readInt();
+		SocketBuffer buffer(msgSize);
+		if (!_readFromPortData(port, buffer)) {
+			break;
+		}
+
+		// Construct an InternalLoggingEvent from the buffer
+		spi::InternalLoggingEvent logEvent = readFromBuffer(buffer);           
+
+		// Has client a known DP?
+		string 	PVSSdp(_searchClientDP(logEvent, port));
+		if (PVSSdp.empty()) {
+			break;
+		}
+
+		// construct message: level|loggername|message|file:linenr
+		string msg(formatString("%s|%s|%s|%s:%d",
+					getLogLevelManager().toString(logEvent.getLogLevel()).c_str(),
+					logEvent.getLoggerName().c_str(),
+					logEvent.getMessage().c_str(),
+					basename(logEvent.getFile().c_str()),
+					logEvent.getLine()));
+
+#if 0
+		// convert the logger event to the PVSSdp value
+		GCFPVString value(msg);
+		LOG_DEBUG(formatString("Msg: %s", msg.c_str()));
+
+		// timestamp conversion
+		timeval		kvlTimestamp;  
+		Time		l4pTimestamp(logEvent.getTimestamp());
+		kvlTimestamp.tv_sec  = l4pTimestamp.sec();
+		kvlTimestamp.tv_usec = l4pTimestamp.usec();
+
+		// log!
+		//TODO
+		// LOG_KEYVALUE_TS(PVSSdp[0], value, KVL_ORIGIN_MAC, kvlTimestamp);
+		//
+#endif
+		// convert logger event to DP log msg
+		string plMsg = logEvent.getTimestamp().getFormattedTime("%d-%m-%y %H:%M:%S.%q") 
+						+ "|" + msg;
+
+		GCFPVString plValue(plMsg);
+		PVSSresult	result = itsDPservice->setValue(PVSSdp, plValue);
+		if (result != PVSS::SA_NO_ERROR) {
+			LOG_DEBUG_STR("setValue returned " << result);
+		}
+	}
+	break;
+
+	default:
+		status = GCFEvent::NOT_HANDLED;
+		break;
+	}
+
+	return (status);
+}
+
+//
+// _readFromPortData(port, buf)
+//
+bool LoggingProcessor::_readFromPortData(GCFPortInterface& port, SocketBuffer& buf)
+{
+	size_t res, read = 0;  
+	do { 
+		res = port.recv(buf.getBuffer() + read, buf.getMaxSize() - read);
+		if (res <= 0) {
+			break;
+		}
+
+		read += res;
+	} while (read < buf.getMaxSize());
+
+	return (read == buf.getMaxSize());
+}
+
+//
+// _seachClientDP(logEvent, port)
+//
+string LoggingProcessor::_searchClientDP(spi::InternalLoggingEvent&	logEvent,
+								 GCFPortInterface&			port)
+{
+	// Known client with valid DP?
+	LogClientMap::iterator iter = itsClients.find(&port);
+	if (iter != itsClients.end() && iter->second.valid) {
+		iter->second.msgCnt++;
+		return (iter->second.DPname);			// just pass its DPname
+	}
+
+	// Unknown client, or known client without atry to find its DPname
+	// Level must be INFO
+	if (logEvent.getLogLevel() != INFO_LOG_LEVEL) {
+		return ("");
+	}
+
+	// Message must start with 'MACProcessScope:"
+	string DPname = logEvent.getMessage();
+	if (DPname.find("MACProcessScope:") != 0) {
+		return ("");
+	}
+
+	// A legal DPname must be after it
+	DPname.erase(0, sizeof("MACProcessScope:"));
+	ltrim(DPname);
+	rtrim(DPname);
+	// '.' must be converted to the '_' in case of DP names
+	uint32	EOS = DPname.size();
+	for (uint32 i = 0; i < EOS; i++) {
+		if (DPname[i] == '.') {
+			DPname[i] = '_';
+		}
+	} 
+	DPname.append(".logMsg");
+	itsClients[&port] = LogClient(DPname);
+	itsClients[&port].msgCnt = 0;
+	itsClients[&port].valid = true;
+	LOG_INFO_STR("Starting log-stream for " << DPname);
+
+	return (DPname);
+}
+
+  } // namespace RTDBDaemons
+ } // namespace GCF
+} // namespace LOFAR

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

+//#  LoggingProcessor.h: 
+//#
+//#  Copyright (C) 2007
+//#  ASTRON (Netherlands Foundation for Research in Astronomy)
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//#  This program is free software; you can redistribute it and/or modify
+//#  it under the terms of the GNU General Public License as published by
+//#  the Free Software Foundation; either version 2 of the License, or
+//#  (at your option) any later version.
+//#
+//#  This program is distributed in the hope that it will be useful,
+//#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//#  GNU General Public License for more details.
+//#
+//#  You should have received a copy of the GNU General Public License
+//#  along with this program; if not, write to the Free Software
+//#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//#  $Id$
+
+#ifndef LOGGINGPROCESSOR_H
+#define LOGGINGPROCESSOR_H
+
+// \file LoggingProcessor.h
+// one_line_description
+
+//# Never #include <config.h> or #include <lofar_config.h> in a header file!
+//# Includes
+#include <Common/LofarLogger.h>
+#include <Common/lofar_map.h>
+#include <Common/lofar_list.h>
+#include <GCF/TM/GCF_Control.h>
+#include <GCF/RTDB/DPservice.h>
+#include <log4cplus/helpers/socketbuffer.h>
+
+// Avoid 'using namespace' in headerfiles
+
+namespace LOFAR {
+  namespace GCF {  
+    namespace RTDBDaemons {
+
+class LoggingProcessor : public TM::GCFTask
+{
+public:
+	explicit LoggingProcessor (const string&	name);
+	~LoggingProcessor ();
+
+private: 
+	// state methods
+	TM::GCFEvent::TResult initial     (TM::GCFEvent& e, TM::GCFPortInterface& p);
+	TM::GCFEvent::TResult operational (TM::GCFEvent& e, TM::GCFPortInterface& p);
+
+	// helper methods
+	bool _readFromPortData(TM::GCFPortInterface& 				port, 
+						   log4cplus::helpers::SocketBuffer&	buf);
+	string _searchClientDP(log4cplus::spi::InternalLoggingEvent&	logEvent,
+						   GCFPortInterface&			port);
+
+	// data members        
+	TM::GCFTCPPort*			itsListener;
+	RTDB::DPservice*		itsDPservice;
+	TM::GCFTimerPort*		itsTimerPort;
+
+	struct	LogClient {
+		string		DPname;
+		int32		msgCnt;
+		bool		valid;
+		LogClient() : msgCnt(-10),valid(false) {};
+		explicit LogClient(const string& name) : DPname(name),msgCnt(-10),valid(false) {};
+	};
+
+	typedef map<TM::GCFPortInterface*, LogClient> 	LogClientMap;
+	LogClientMap 	 		itsClients;
+
+	// admin members
+	typedef list<TM::GCFPortInterface*> TClients;
+	TClients        		itsClientsGarbage;
+
+};
+
+    } // namespace RTDBDaemons
+  } // namespace GCF
+} // namespace LOFAR
+
+#endif

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

+//#  CLPMain.cc: 
+//#
+//#  Copyright (C) 2002-2003
+//#  ASTRON (Netherlands Foundation for Research in Astronomy)
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//#  This program is free software; you can redistribute it and/or modify
+//#  it under the terms of the GNU General Public License as published by
+//#  the Free Software Foundation; either version 2 of the License, or
+//#  (at your option) any later version.
+//#
+//#  This program is distributed in the hope that it will be useful,
+//#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//#  GNU General Public License for more details.
+//#
+//#  You should have received a copy of the GNU General Public License
+//#  along with this program; if not, write to the Free Software
+//#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//#
+//#  $Id$
+
+#include <lofar_config.h>
+
+#include <GCF/TM/GCF_Control.h>
+#include "LoggingProcessor.h"
+
+using namespace LOFAR::GCF::TM;
+using namespace LOFAR::GCF::RTDBDaemons;
+
+int main(int argc, char *argv[])
+{
+	GCFTask::init(argc, argv);
+
+	LoggingProcessor clp("LoggingProcessor"); 
+	clp.start(); // make initial transition
+
+	GCFTask::run();
+
+	return (0);
+}

MAC/APL/CURTDBDaemons/src/LoggingProcessor/Makefile.am

+# Executables
+bin_PROGRAMS 				= LoggingProcessor
+
+#LoggingProcessor_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
+#							  -Wno-deprecated \
+#							  -fmessage-length=0 \
+#							  -fdiagnostics-show-location=once
+
+LoggingProcessor_SOURCES	= LoggingProcessor.cc \
+							  LoggingProcessorMain.cc
+LoggingProcessor_LDADD		= $(LOFAR_DEPEND) 
+LoggingProcessor_DEPENDENCIES=$(LOFAR_DEPEND)
+
+bin_SCRIPTS					= 
+
+NOINSTHDRS 					= LoggingProcessor.h
+
+INSTHDRS 					= 
+
+BUILT_SOURCES				= $(ph_HEADERS)
+
+pkginclude_HEADERS 			= $(NOINSTHDRS) $(INSTHDRS)
+
+DOCHDRS						= $(pkginclude_HEADERS) $(BUILT_SOURCES)
+
+EXTRA_DIST 					= $(configfiles_DATA) $(sysconf_DATA)
+
+#in case of make install these files will be copied to the bindir beside the test apps
+configfilesdir				= $(bindir)
+configfiles_DATA 			= 
+
+sysconf_DATA				= LoggingProcessor.conf \
+							  LoggingProcessor.log_prop 
+
+include $(top_srcdir)/Makefile.common

MAC/APL/CURTDBDaemons/src/Makefile.am

+SUBDIRS = LoggingProcessor
+
+include $(top_srcdir)/Makefile.common
+

MAC/APL/CURTDBDaemons/test/Makefile.am

+AM_CPPFLAGS						= -I$(top_builddir)/include
+
+bin_PROGRAMS					= tLoggingProcessor
+
+tLoggingProcessor_SOURCES		= tLoggingProcessor.cc
+tLoggingProcessor_DEPENDENCIES	= $(LOFAR_DEPEND)
+
+include $(top_srcdir)/Makefile.common