From e00afce4e96368650a795636bc9a9bc312468e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20=C4=8Cerven=C3=BD?= <radovan.cerveny@gmail.com>
Date: Fri, 4 Mar 2016 23:45:46 +0100
Subject: [PATCH] took out unnecesarry dependence on alib2data
---
ameasure2/makefile.conf | 6 +++---
ameasure2/src/ameasure.cpp | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ameasure2/makefile.conf b/ameasure2/makefile.conf
index 82cb3b1377..7993890710 100644
--- a/ameasure2/makefile.conf
+++ b/ameasure2/makefile.conf
@@ -1,4 +1,4 @@
EXECUTABLE:=ameasure2
-LINK_PATHS=../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2data alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/ameasure2/src/ameasure.cpp b/ameasure2/src/ameasure.cpp
index f91c39d01f..2f34c572a5 100644
--- a/ameasure2/src/ameasure.cpp
+++ b/ameasure2/src/ameasure.cpp
@@ -5,7 +5,8 @@
#include "provisioner/MeasurementProvisionerConfigurationXml.hpp"
#include "provisioner/MeasurementProvisionerResultsXml.hpp"
#include "provisioner/MeasurementProvisioner.hpp"
-#include "factory/XmlDataFactory.hpp"
+#include "exception/CommonException.h"
+#include "sax/SaxParseInterface.h"
#include <tclap/CmdLine.h>
#include <measure>
@@ -33,9 +34,6 @@ int main ( int argc, char * * argv ) {
return 0;
- } catch ( const exception::AlibException & exception ) {
- alib::XmlDataFactory::toStdout ( exception );
- return 1;
} catch ( const exception::CommonException & exception ) {
std::cerr << "CommonException caught: " << exception.getCause ( ) << std::endl;
return 4;
--
GitLab