From 8d5d28a56bd3d13af2e00a8843fa60fe22e07c78 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Fri, 24 Oct 2008 10:41:00 +0000
Subject: [PATCH] Bug 1000: Removed log_prop files.
---
MAC/APL/CEPCU/src/OfflineControl/Makefile.am | 9 +----
.../OfflineControl/OfflineControl.log_prop.in | 29 ---------------
MAC/APL/CEPCU/src/OnlineControl/Makefile.am | 9 +----
.../CEPCU/src/OnlineControl/OnlineControl.cc | 24 ++++++------
.../OnlineControl/OnlineControl.log_prop.in | 20 ----------
.../src/CTStartDaemon/CTStartDaemon.log_prop | 20 ----------
.../CUDaemons/src/CTStartDaemon/Makefile.am | 3 +-
.../CUDaemons/src/ServiceBroker/Makefile.am | 3 +-
.../src/ServiceBroker/ServiceBroker.log_prop | 20 ----------
.../KeyValueLogger/KeyValueLogger.log_prop | 0
.../src/KeyValueLogger/Makefile.am | 3 +-
.../CURTDBDaemons/src/SASGateway/Makefile.am | 3 +-
.../src/SASGateway/SASGateway.log_prop | 18 ---------
.../PAC/CalServer/src/CalServer.log_prop.in | 37 -------------------
MAC/APL/PAC/CalServer/src/Makefile.am | 9 +----
MAC/APL/PIC/RSPDriver/src/Makefile.am | 27 ++++----------
.../PIC/RSPDriver/src/RSPDriver.log_prop.in | 32 ----------------
MAC/APL/PIC/RSPDriver/src/rspctl.log_prop.in | 37 -------------------
MAC/APL/TestCtlr/src/CodeLoggingTest.log_prop | 17 ---------
MAC/APL/TestCtlr/src/ControllerMenu.log_prop | 13 -------
MAC/APL/TestCtlr/src/Makefile.am | 13 -------
MAC/APL/TestCtlr/src/TestController.log_prop | 13 -------
22 files changed, 28 insertions(+), 331 deletions(-)
delete mode 100644 MAC/APL/CEPCU/src/OfflineControl/OfflineControl.log_prop.in
delete mode 100644 MAC/APL/CEPCU/src/OnlineControl/OnlineControl.log_prop.in
delete mode 100644 MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.log_prop
delete mode 100644 MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.log_prop
delete mode 100644 MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.log_prop
delete mode 100644 MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.log_prop
delete mode 100644 MAC/APL/PAC/CalServer/src/CalServer.log_prop.in
delete mode 100644 MAC/APL/PIC/RSPDriver/src/RSPDriver.log_prop.in
delete mode 100644 MAC/APL/PIC/RSPDriver/src/rspctl.log_prop.in
delete mode 100644 MAC/APL/TestCtlr/src/CodeLoggingTest.log_prop
delete mode 100644 MAC/APL/TestCtlr/src/ControllerMenu.log_prop
delete mode 100644 MAC/APL/TestCtlr/src/TestController.log_prop
diff --git a/MAC/APL/CEPCU/src/OfflineControl/Makefile.am b/MAC/APL/CEPCU/src/OfflineControl/Makefile.am
index 106bb28c82f..11404259dce 100644
--- a/MAC/APL/CEPCU/src/OfflineControl/Makefile.am
+++ b/MAC/APL/CEPCU/src/OfflineControl/Makefile.am
@@ -26,13 +26,6 @@ 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 = OfflineControl.log_prop
-
-%.log_prop: %.log_prop.in
- cp $< $@
-
-clean-local:
- rm -f *.ph
+sysconf_DATA =
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.log_prop.in b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.log_prop.in
deleted file mode 100644
index bd276a77804..00000000000
--- a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.log_prop.in
+++ /dev/null
@@ -1,29 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=INFO, STDOUT, FILE
-log4cplus.additivity.ASTRON=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/OfflineControl.log
-log4cplus.appender.FILE.MaxFileSize=5MB
-log4cplus.appender.FILE.MaxBackupIndex=5
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
-
-log4cplus.logger.TRC=DUMP
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.additivity.MAC=FALSE
-log4cplus.logger.MAC=DEBUG, STDOUT, FILE
-
-#log4cplus.additivity.TRC=FALSE
-#log4cplus.logger.TRC=TRACE, FILE
-
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Makefile.am b/MAC/APL/CEPCU/src/OnlineControl/Makefile.am
index 3f43e18cc03..0152195438d 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/Makefile.am
+++ b/MAC/APL/CEPCU/src/OnlineControl/Makefile.am
@@ -26,13 +26,6 @@ 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 = OnlineControl.log_prop
-
-%.log_prop: %.log_prop.in
- cp $< $@
-
-clean-local:
- rm -f *.ph
+sysconf_DATA =
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 7db31bfe085..719fa2a8f90 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -42,7 +42,7 @@
#include <PLC/PCCmd.h>
#include "OnlineControl.h"
-#include "OnlineControlDefines.h"
+#include "PVSSDatapointDefs.h"
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::TM;
@@ -160,7 +160,7 @@ void OnlineControl::_setState(CTState::CTstateNr newState)
// Update PVSS to inform operator.
if (itsPropertySet) {
CTState cts;
- itsPropertySet->setValue(PVSSNAME_FSM_CURACT, GCFPVString(cts.name(newState)));
+ itsPropertySet->setValue(PN_FSM_CURRENT_ACTION, GCFPVString(cts.name(newState)));
}
}
@@ -311,12 +311,12 @@ GCFEvent::TResult OnlineControl::initial_state(GCFEvent& event,
case F_INIT: {
// Get access to my own propertyset.
- uint32 obsID = globalParameterSet()->getUint32("Observation.ObsID");
- string propSetName = formatString(ONC_PROPSET_NAME, obsID);
+// uint32 obsID = globalParameterSet()->getUint32("Observation.ObsID");
+ string propSetName(createPropertySetName(PSN_ONLINE_CTRL, getName()));
LOG_DEBUG_STR ("Activating PropertySet: "<< propSetName);
itsPropertySet = new RTDBPropertySet(propSetName,
- ONC_PROPSET_TYPE,
- PSAT_WO,
+ PST_ONLINE_CTRL,
+ PSAT_RW,
this);
}
break;
@@ -334,8 +334,8 @@ GCFEvent::TResult OnlineControl::initial_state(GCFEvent& event,
case F_TIMER: { // must be timer that PropSet is online.
// update PVSS.
LOG_TRACE_FLOW ("Updateing state to PVSS");
- itsPropertySet->setValue(PVSSNAME_FSM_CURACT, GCFPVString("initial"));
- itsPropertySet->setValue(PVSSNAME_FSM_ERROR, GCFPVString(""));
+ itsPropertySet->setValue(PN_FSM_CURRENT_ACTION, GCFPVString("initial"));
+ itsPropertySet->setValue(PN_FSM_ERROR, GCFPVString(""));
// Start ParentControl task
LOG_DEBUG ("Enabling ParentControl task");
@@ -378,8 +378,8 @@ GCFEvent::TResult OnlineControl::active_state(GCFEvent& event, GCFPortInterface&
switch (event.signal) {
case F_ENTRY: {
// update PVSS
- itsPropertySet->setValue(PVSSNAME_FSM_CURACT, GCFPVString("active"));
- itsPropertySet->setValue(PVSSNAME_FSM_ERROR, GCFPVString(""));
+ itsPropertySet->setValue(PN_FSM_CURRENT_ACTION, GCFPVString("active"));
+ itsPropertySet->setValue(PN_FSM_ERROR, GCFPVString(""));
}
break;
@@ -505,8 +505,8 @@ GCFEvent::TResult OnlineControl::finishing_state(GCFEvent& event, GCFPortInterfa
switch (event.signal) {
case F_ENTRY: {
// update PVSS
- itsPropertySet->setValue(PVSSNAME_FSM_CURACT, GCFPVString("finished"));
- itsPropertySet->setValue(PVSSNAME_FSM_ERROR, GCFPVString(""));
+ itsPropertySet->setValue(PN_FSM_CURRENT_ACTION, GCFPVString("finished"));
+ itsPropertySet->setValue(PN_FSM_ERROR, GCFPVString(""));
itsTimerPort->setTimer(1.0);
break;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.log_prop.in b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.log_prop.in
deleted file mode 100644
index 8e62511adc1..00000000000
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.log_prop.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=DEBUG, STDOUT, FILE
-
-log4cplus.logger.TRC=TRACE2
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/OnlineControl.log
-log4cplus.appender.FILE.MaxFileSize=5MB
-log4cplus.appender.FILE.MaxBackupIndex=5
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.log_prop b/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.log_prop
deleted file mode 100644
index 14f67238d8d..00000000000
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.log_prop
+++ /dev/null
@@ -1,20 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=DEBUG, STDOUT, FILE
-
-log4cplus.logger.TRC=TRACE5
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/CTStartDaemon.log
-log4cplus.appender.FILE.MaxFileSize=5MB
-log4cplus.appender.FILE.MaxBackupIndex=5
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am b/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
index d054d72dc93..127a86f962c 100644
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
+++ b/MAC/APL/CUDaemons/src/CTStartDaemon/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA)
configfilesdir=$(bindir)
configfiles_DATA =
-sysconf_DATA = CTStartDaemon.conf \
- CTStartDaemon.log_prop
+sysconf_DATA = CTStartDaemon.conf
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
index e20cac99238..f6a9179966a 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
+++ b/MAC/APL/CUDaemons/src/ServiceBroker/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA)
configfilesdir=$(bindir)
configfiles_DATA =
-sysconf_DATA = ServiceBroker.conf \
- ServiceBroker.log_prop
+sysconf_DATA = ServiceBroker.conf
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.log_prop b/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.log_prop
deleted file mode 100644
index 1579863d6e1..00000000000
--- a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.log_prop
+++ /dev/null
@@ -1,20 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=DEBUG, FILE
-
-log4cplus.logger.TRC=TRACE5
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/ServiceBroker.log
-log4cplus.appender.FILE.MaxFileSize=5MB
-log4cplus.appender.FILE.MaxBackupIndex=5
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.log_prop b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.log_prop
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am
index 6e898d37fb7..6769087003c 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA)
configfilesdir = $(bindir)
configfiles_DATA =
-sysconf_DATA = KeyValueLogger.conf \
- KeyValueLogger.log_prop
+sysconf_DATA = KeyValueLogger.conf
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am b/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am
index 6a67a5844a0..e5b0c123c98 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST = $(configfiles_DATA) $(sysconf_DATA)
configfilesdir = $(bindir)
configfiles_DATA =
-sysconf_DATA = SASGateway.conf \
- SASGateway.log_prop
+sysconf_DATA = SASGateway.conf
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.log_prop b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.log_prop
deleted file mode 100644
index 98ce78b004e..00000000000
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.log_prop
+++ /dev/null
@@ -1,18 +0,0 @@
-# add your custom loggers and appenders here
-#
-log4cplus.rootLogger=INFO, FILE
-log4cplus.logger.TRC=DEBUG, FILE
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/%filename.log
-log4cplus.appender.FILE.MaxFileSize=5MB
-log4cplus.appender.FILE.MaxBackupIndex=5
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
-
diff --git a/MAC/APL/PAC/CalServer/src/CalServer.log_prop.in b/MAC/APL/PAC/CalServer/src/CalServer.log_prop.in
deleted file mode 100644
index a79a3f29b8d..00000000000
--- a/MAC/APL/PAC/CalServer/src/CalServer.log_prop.in
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-log4cplus.rootLogger=INFO, MACSTDERR
-log4cplus.additivity.ASTRON=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-
-log4cplus.appender.MACSTDERR=log4cplus::ConsoleAppender
-log4cplus.appender.MACSTDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.MACSTDERR.layout.ConversionPattern=%x %D{%d-%m %H:%M:%S.%q} %-5p %c{4} - %m [%.25l]%n
-log4cplus.appender.MACSTDERR.logToStdErr=true
-
-log4cplus.appender.MACCLP=log4cplus::SocketAppender
-log4cplus.appender.MACCLP.port=25003
-log4cplus.appender.MACCLP.host=lofar30
-log4cplus.appender.MACCLP.Threshold=INFO
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=CalServer.log
-log4cplus.appender.FILE.MaxFileSize=10MB
-log4cplus.appender.FILE.MaxBackupIndex=10
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.FILE.logToStdErr=true
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
-
-log4cplus.additivity.MAC=FALSE
-log4cplus.logger.MAC=INFO, STDOUT
-
-log4cplus.logger.TRC=DUMP
-log4cplus.additivity.TRC=FALSE
-
-#log4cplus.additivity.TRC=FALSE
-#log4cplus.logger.TRC=TRACE, STDOUT
diff --git a/MAC/APL/PAC/CalServer/src/Makefile.am b/MAC/APL/PAC/CalServer/src/Makefile.am
index 345135892b4..478818ca881 100644
--- a/MAC/APL/PAC/CalServer/src/Makefile.am
+++ b/MAC/APL/PAC/CalServer/src/Makefile.am
@@ -19,8 +19,7 @@ BUILT_SOURCES = \
SourceCatalog.conf \
LBAntennas.conf \
HBAntennas.conf \
- AntennaArrays.conf \
- CalServer.log_prop
+ AntennaArrays.conf
EXTRA_DIST = $(BUILT_SOURCES)
@@ -30,11 +29,7 @@ sysconf_DATA = \
SourceCatalog.conf \
LBAntennas.conf \
HBAntennas.conf \
- AntennaArrays.conf \
- CalServer.log_prop
-
-%.log_prop: %.log_prop.in
- cp $< $@
+ AntennaArrays.conf
%.conf: %.conf.in
cp $< $@
diff --git a/MAC/APL/PIC/RSPDriver/src/Makefile.am b/MAC/APL/PIC/RSPDriver/src/Makefile.am
index d738872a913..58aea0b5534 100644
--- a/MAC/APL/PIC/RSPDriver/src/Makefile.am
+++ b/MAC/APL/PIC/RSPDriver/src/Makefile.am
@@ -17,11 +17,10 @@ SUFFIXES = .ph
$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
BUILT_SOURCES = \
- RemoteStation.conf \
- RSPDriver.conf \
- rspctl.conf \
- RSPDriver.log_prop \
- rspctl.log_prop
+ rspctl.conf
+
+# RemoteStation.conf
+# RSPDriver.conf
clean-local:
rm -f *.ph
@@ -30,11 +29,10 @@ EXTRA_DIST = \
$(BUILT_SOURCES)
sysconf_DATA = \
- RemoteStation.conf \
- RSPDriver.conf \
- rspctl.conf \
- RSPDriver.log_prop \
- rspctl.log_prop
+ rspctl.conf
+
+# RemoteStation.conf
+# RSPDriver.conf
%.properties: $(MAC_CONFIG)/%.properties
cp $< $@
@@ -42,15 +40,6 @@ sysconf_DATA = \
%.conf: %.conf.in
cp $< $@
-%.log_prop: %.log_prop.in
- cp $< $@
-
-%.ns: %.ns.in
- cp $< $@
-
-%.top: %.top.in
- cp $< $@
-
lib_LTLIBRARIES = libepa.la
include_HEADERS =
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.log_prop.in b/MAC/APL/PIC/RSPDriver/src/RSPDriver.log_prop.in
deleted file mode 100644
index c624e5d5626..00000000000
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.log_prop.in
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-#log4cplus.rootLogger=INFO, MACSTDERR, FILE
-log4cplus.rootLogger=DEBUG, STDOUT
-log4cplus.additivity.ASTRON=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-
-log4cplus.appender.MACSTDERR=log4cplus::ConsoleAppender
-log4cplus.appender.MACSTDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.MACSTDERR.layout.ConversionPattern=%x %D{%d-%m %H:%M:%S.%q} %-5p %c{4} - %m [%.25l]%n
-log4cplus.appender.MACSTDERR.logToStdErr=true
-
-log4cplus.appender.MACCLP=log4cplus::SocketAppender
-log4cplus.appender.MACCLP.port=25003
-log4cplus.appender.MACCLP.host=lofar30
-log4cplus.appender.MACCLP.Threshold=INFO
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=../log/RSPDriver.log
-log4cplus.appender.FILE.MaxFileSize=10MB
-log4cplus.appender.FILE.MaxBackupIndex=10
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.FILE.logToStdErr=true
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
-
-log4cplus.logger.TRC=DUMP
-log4cplus.additivity.TRC=FALSE
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.log_prop.in b/MAC/APL/PIC/RSPDriver/src/rspctl.log_prop.in
deleted file mode 100644
index 83a6fcdb0eb..00000000000
--- a/MAC/APL/PIC/RSPDriver/src/rspctl.log_prop.in
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-log4cplus.rootLogger=INFO, MACSTDERR
-log4cplus.additivity.ASTRON=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-
-log4cplus.appender.MACSTDERR=log4cplus::ConsoleAppender
-log4cplus.appender.MACSTDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.MACSTDERR.layout.ConversionPattern=%x %D{%d-%m %H:%M:%S.%q} %-5p %c{4} - %m [%.25l]%n
-log4cplus.appender.MACSTDERR.logToStdErr=true
-
-log4cplus.appender.MACCLP=log4cplus::SocketAppender
-log4cplus.appender.MACCLP.port=25003
-log4cplus.appender.MACCLP.host=lofar30
-log4cplus.appender.MACCLP.Threshold=INFO
-
-log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=rspctl.log
-log4cplus.appender.FILE.MaxFileSize=10MB
-log4cplus.appender.FILE.MaxBackupIndex=10
-log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-log4cplus.appender.FILE.logToStdErr=true
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
-
-log4cplus.logger.TRC=DUMP
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.additivity.MAC=FALSE
-log4cplus.logger.MAC=INFO, FILE
-
-# log4cplus.additivity.TRC=FALSE
-# log4cplus.logger.TRC=TRACE, FILE
diff --git a/MAC/APL/TestCtlr/src/CodeLoggingTest.log_prop b/MAC/APL/TestCtlr/src/CodeLoggingTest.log_prop
deleted file mode 100644
index 6b194cfccb3..00000000000
--- a/MAC/APL/TestCtlr/src/CodeLoggingTest.log_prop
+++ /dev/null
@@ -1,17 +0,0 @@
-log4cplus.rootLogger=INFO, STDOUT, MACCLP
-log4cplus.additivity.ASTRON=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-
-log4cplus.appender.MACCLP=log4cplus::SocketAppender
-log4cplus.appender.MACCLP.port=25003
-log4cplus.appender.MACCLP.host=lofar30
-log4cplus.appender.MACCLP.Threshold=INFO
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
-
-log4cplus.logger.TRC=DEBUG, DUMP
-log4cplus.additivity.TRC=FALSE
-
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.log_prop b/MAC/APL/TestCtlr/src/ControllerMenu.log_prop
deleted file mode 100644
index f96b18a8a6f..00000000000
--- a/MAC/APL/TestCtlr/src/ControllerMenu.log_prop
+++ /dev/null
@@ -1,13 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=FATAL, STDOUT
-
-log4cplus.logger.TRC=DEBUG
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
diff --git a/MAC/APL/TestCtlr/src/Makefile.am b/MAC/APL/TestCtlr/src/Makefile.am
index 5052cc432b4..dc6193b7674 100644
--- a/MAC/APL/TestCtlr/src/Makefile.am
+++ b/MAC/APL/TestCtlr/src/Makefile.am
@@ -33,19 +33,6 @@ DOCHDRS = $(pkginclude_HEADERS) $(BUILT_SOURCES)
EXTRA_DIST =
-#in case of make install these files will be copied to the bindir beside the test apps
-
-sysconf_DATA = ControllerMenu.log_prop TestController.log_prop CodeLoggingTest.log_prop
-
-%.log_prop: %.log_prop.in
- cp $< $@
-
-%.conf: %.conf.in
- cp $< $@
-
-clean-local:
- rm -f *.ph
-
versiontestctlr_SOURCES = versiontestctlr.cc Package__Version.cc
versiontestctlr_LDADD =
versiontestctlr_DEPENDENCIES = $(LOFAR_DEPEND)
diff --git a/MAC/APL/TestCtlr/src/TestController.log_prop b/MAC/APL/TestCtlr/src/TestController.log_prop
deleted file mode 100644
index 3cc495b88b9..00000000000
--- a/MAC/APL/TestCtlr/src/TestController.log_prop
+++ /dev/null
@@ -1,13 +0,0 @@
-# add your custom loggers and appenders here
-#
-
-log4cplus.rootLogger=DEBUG, STDOUT
-
-log4cplus.logger.TRC=TRACE3
-log4cplus.additivity.TRC=FALSE
-
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
-log4cplus.appender.STDOUT.logToStdErr=true
-
--
GitLab