From 4b3518661f589c561a723b971b6b8756b94500f7 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 24 Sep 2017 20:05:11 +0200 Subject: [PATCH] make libguh-core a proper lib --- guh.pro | 23 +--- {server => libguh-core}/bluetoothserver.cpp | 0 {server => libguh-core}/bluetoothserver.h | 0 .../certificategenerator.cpp | 0 .../certificategenerator.h | 0 {server => libguh-core}/guhconfiguration.cpp | 29 ----- {server => libguh-core}/guhconfiguration.h | 0 {server => libguh-core}/guhcore.cpp | 0 {server => libguh-core}/guhcore.h | 0 {server => libguh-core}/httpreply.cpp | 0 {server => libguh-core}/httpreply.h | 0 {server => libguh-core}/httprequest.cpp | 0 {server => libguh-core}/httprequest.h | 0 .../jsonrpc/actionhandler.cpp | 0 .../jsonrpc/actionhandler.h | 0 .../jsonrpc/configurationhandler.cpp | 0 .../jsonrpc/configurationhandler.h | 0 .../jsonrpc/devicehandler.cpp | 0 .../jsonrpc/devicehandler.h | 0 .../jsonrpc/eventhandler.cpp | 0 .../jsonrpc/eventhandler.h | 0 .../jsonrpc/jsonhandler.cpp | 0 {server => libguh-core}/jsonrpc/jsonhandler.h | 0 .../jsonrpc/jsonrpcserver.cpp | 0 .../jsonrpc/jsonrpcserver.h | 0 {server => libguh-core}/jsonrpc/jsontypes.cpp | 0 {server => libguh-core}/jsonrpc/jsontypes.h | 0 .../jsonrpc/logginghandler.cpp | 0 .../jsonrpc/logginghandler.h | 0 .../jsonrpc/networkmanagerhandler.cpp | 0 .../jsonrpc/networkmanagerhandler.h | 0 .../jsonrpc/ruleshandler.cpp | 0 .../jsonrpc/ruleshandler.h | 0 .../jsonrpc/statehandler.cpp | 0 .../jsonrpc/statehandler.h | 0 libguh-core/libguh-core.pro | 122 ++++++++++++++++++ {server => libguh-core}/logging/logengine.cpp | 0 {server => libguh-core}/logging/logengine.h | 0 {server => libguh-core}/logging/logentry.cpp | 0 {server => libguh-core}/logging/logentry.h | 0 {server => libguh-core}/logging/logfilter.cpp | 0 {server => libguh-core}/logging/logfilter.h | 0 {server => libguh-core}/logging/logging.h | 0 {server => libguh-core}/logging/logsource.cpp | 0 {server => libguh-core}/logging/logsource.h | 0 {tests/auto => libguh-core}/mocktcpserver.cpp | 0 {tests/auto => libguh-core}/mocktcpserver.h | 0 .../networkmanager/dbus-interfaces.h | 0 .../networkmanager/networkconnection.cpp | 0 .../networkmanager/networkconnection.h | 0 .../networkmanager/networkdevice.cpp | 0 .../networkmanager/networkdevice.h | 0 .../networkmanager/networkmanager.cpp | 0 .../networkmanager/networkmanager.h | 0 .../networkmanager/networksettings.cpp | 0 .../networkmanager/networksettings.h | 0 .../networkmanager/wirednetworkdevice.cpp | 0 .../networkmanager/wirednetworkdevice.h | 0 .../networkmanager/wirelessaccesspoint.cpp | 0 .../networkmanager/wirelessaccesspoint.h | 0 .../networkmanager/wirelessnetworkdevice.cpp | 0 .../networkmanager/wirelessnetworkdevice.h | 0 .../rest/deviceclassesresource.cpp | 0 .../rest/deviceclassesresource.h | 0 .../rest/devicesresource.cpp | 0 .../rest/devicesresource.h | 0 {server => libguh-core}/rest/logsresource.cpp | 0 {server => libguh-core}/rest/logsresource.h | 0 .../rest/pluginsresource.cpp | 0 .../rest/pluginsresource.h | 0 {server => libguh-core}/rest/restresource.cpp | 0 {server => libguh-core}/rest/restresource.h | 0 {server => libguh-core}/rest/restserver.cpp | 0 {server => libguh-core}/rest/restserver.h | 0 .../rest/rulesresource.cpp | 0 {server => libguh-core}/rest/rulesresource.h | 0 .../rest/vendorsresource.cpp | 0 .../rest/vendorsresource.h | 0 {server => libguh-core}/rule.cpp | 0 {server => libguh-core}/rule.h | 0 {server => libguh-core}/ruleengine.cpp | 0 {server => libguh-core}/ruleengine.h | 0 {server => libguh-core}/servermanager.cpp | 16 +-- {server => libguh-core}/servermanager.h | 12 +- {server => libguh-core}/stateevaluator.cpp | 0 {server => libguh-core}/stateevaluator.h | 0 {server => libguh-core}/tcpserver.cpp | 6 - {server => libguh-core}/tcpserver.h | 0 {server => libguh-core}/time/calendaritem.cpp | 0 {server => libguh-core}/time/calendaritem.h | 0 .../time/repeatingoption.cpp | 0 .../time/repeatingoption.h | 0 .../time/timedescriptor.cpp | 0 {server => libguh-core}/time/timedescriptor.h | 0 .../time/timeeventitem.cpp | 0 {server => libguh-core}/time/timeeventitem.h | 0 {server => libguh-core}/time/timemanager.cpp | 4 +- {server => libguh-core}/time/timemanager.h | 2 - {server => libguh-core}/tokeninfo.cpp | 0 {server => libguh-core}/tokeninfo.h | 0 .../transportinterface.cpp | 0 {server => libguh-core}/transportinterface.h | 0 {server => libguh-core}/usermanager.cpp | 0 {server => libguh-core}/usermanager.h | 0 {server => libguh-core}/webserver.cpp | 6 - {server => libguh-core}/webserver.h | 0 {server => libguh-core}/websocketserver.cpp | 6 - {server => libguh-core}/websocketserver.h | 0 server/server.pri | 120 ----------------- server/server.pro | 5 +- tests/auto/autotests.pri | 12 +- tests/tests.pro | 3 +- 112 files changed, 142 insertions(+), 224 deletions(-) rename {server => libguh-core}/bluetoothserver.cpp (100%) rename {server => libguh-core}/bluetoothserver.h (100%) rename {server => libguh-core}/certificategenerator.cpp (100%) rename {server => libguh-core}/certificategenerator.h (100%) rename {server => libguh-core}/guhconfiguration.cpp (94%) rename {server => libguh-core}/guhconfiguration.h (100%) rename {server => libguh-core}/guhcore.cpp (100%) rename {server => libguh-core}/guhcore.h (100%) rename {server => libguh-core}/httpreply.cpp (100%) rename {server => libguh-core}/httpreply.h (100%) rename {server => libguh-core}/httprequest.cpp (100%) rename {server => libguh-core}/httprequest.h (100%) rename {server => libguh-core}/jsonrpc/actionhandler.cpp (100%) rename {server => libguh-core}/jsonrpc/actionhandler.h (100%) rename {server => libguh-core}/jsonrpc/configurationhandler.cpp (100%) rename {server => libguh-core}/jsonrpc/configurationhandler.h (100%) rename {server => libguh-core}/jsonrpc/devicehandler.cpp (100%) rename {server => libguh-core}/jsonrpc/devicehandler.h (100%) rename {server => libguh-core}/jsonrpc/eventhandler.cpp (100%) rename {server => libguh-core}/jsonrpc/eventhandler.h (100%) rename {server => libguh-core}/jsonrpc/jsonhandler.cpp (100%) rename {server => libguh-core}/jsonrpc/jsonhandler.h (100%) rename {server => libguh-core}/jsonrpc/jsonrpcserver.cpp (100%) rename {server => libguh-core}/jsonrpc/jsonrpcserver.h (100%) rename {server => libguh-core}/jsonrpc/jsontypes.cpp (100%) rename {server => libguh-core}/jsonrpc/jsontypes.h (100%) rename {server => libguh-core}/jsonrpc/logginghandler.cpp (100%) rename {server => libguh-core}/jsonrpc/logginghandler.h (100%) rename {server => libguh-core}/jsonrpc/networkmanagerhandler.cpp (100%) rename {server => libguh-core}/jsonrpc/networkmanagerhandler.h (100%) rename {server => libguh-core}/jsonrpc/ruleshandler.cpp (100%) rename {server => libguh-core}/jsonrpc/ruleshandler.h (100%) rename {server => libguh-core}/jsonrpc/statehandler.cpp (100%) rename {server => libguh-core}/jsonrpc/statehandler.h (100%) create mode 100644 libguh-core/libguh-core.pro rename {server => libguh-core}/logging/logengine.cpp (100%) rename {server => libguh-core}/logging/logengine.h (100%) rename {server => libguh-core}/logging/logentry.cpp (100%) rename {server => libguh-core}/logging/logentry.h (100%) rename {server => libguh-core}/logging/logfilter.cpp (100%) rename {server => libguh-core}/logging/logfilter.h (100%) rename {server => libguh-core}/logging/logging.h (100%) rename {server => libguh-core}/logging/logsource.cpp (100%) rename {server => libguh-core}/logging/logsource.h (100%) rename {tests/auto => libguh-core}/mocktcpserver.cpp (100%) rename {tests/auto => libguh-core}/mocktcpserver.h (100%) rename {server => libguh-core}/networkmanager/dbus-interfaces.h (100%) rename {server => libguh-core}/networkmanager/networkconnection.cpp (100%) rename {server => libguh-core}/networkmanager/networkconnection.h (100%) rename {server => libguh-core}/networkmanager/networkdevice.cpp (100%) rename {server => libguh-core}/networkmanager/networkdevice.h (100%) rename {server => libguh-core}/networkmanager/networkmanager.cpp (100%) rename {server => libguh-core}/networkmanager/networkmanager.h (100%) rename {server => libguh-core}/networkmanager/networksettings.cpp (100%) rename {server => libguh-core}/networkmanager/networksettings.h (100%) rename {server => libguh-core}/networkmanager/wirednetworkdevice.cpp (100%) rename {server => libguh-core}/networkmanager/wirednetworkdevice.h (100%) rename {server => libguh-core}/networkmanager/wirelessaccesspoint.cpp (100%) rename {server => libguh-core}/networkmanager/wirelessaccesspoint.h (100%) rename {server => libguh-core}/networkmanager/wirelessnetworkdevice.cpp (100%) rename {server => libguh-core}/networkmanager/wirelessnetworkdevice.h (100%) rename {server => libguh-core}/rest/deviceclassesresource.cpp (100%) rename {server => libguh-core}/rest/deviceclassesresource.h (100%) rename {server => libguh-core}/rest/devicesresource.cpp (100%) rename {server => libguh-core}/rest/devicesresource.h (100%) rename {server => libguh-core}/rest/logsresource.cpp (100%) rename {server => libguh-core}/rest/logsresource.h (100%) rename {server => libguh-core}/rest/pluginsresource.cpp (100%) rename {server => libguh-core}/rest/pluginsresource.h (100%) rename {server => libguh-core}/rest/restresource.cpp (100%) rename {server => libguh-core}/rest/restresource.h (100%) rename {server => libguh-core}/rest/restserver.cpp (100%) rename {server => libguh-core}/rest/restserver.h (100%) rename {server => libguh-core}/rest/rulesresource.cpp (100%) rename {server => libguh-core}/rest/rulesresource.h (100%) rename {server => libguh-core}/rest/vendorsresource.cpp (100%) rename {server => libguh-core}/rest/vendorsresource.h (100%) rename {server => libguh-core}/rule.cpp (100%) rename {server => libguh-core}/rule.h (100%) rename {server => libguh-core}/ruleengine.cpp (100%) rename {server => libguh-core}/ruleengine.h (100%) rename {server => libguh-core}/servermanager.cpp (97%) rename {server => libguh-core}/servermanager.h (95%) rename {server => libguh-core}/stateevaluator.cpp (100%) rename {server => libguh-core}/stateevaluator.h (100%) rename {server => libguh-core}/tcpserver.cpp (98%) rename {server => libguh-core}/tcpserver.h (100%) rename {server => libguh-core}/time/calendaritem.cpp (100%) rename {server => libguh-core}/time/calendaritem.h (100%) rename {server => libguh-core}/time/repeatingoption.cpp (100%) rename {server => libguh-core}/time/repeatingoption.h (100%) rename {server => libguh-core}/time/timedescriptor.cpp (100%) rename {server => libguh-core}/time/timedescriptor.h (100%) rename {server => libguh-core}/time/timeeventitem.cpp (100%) rename {server => libguh-core}/time/timeeventitem.h (100%) rename {server => libguh-core}/time/timemanager.cpp (96%) rename {server => libguh-core}/time/timemanager.h (98%) rename {server => libguh-core}/tokeninfo.cpp (100%) rename {server => libguh-core}/tokeninfo.h (100%) rename {server => libguh-core}/transportinterface.cpp (100%) rename {server => libguh-core}/transportinterface.h (100%) rename {server => libguh-core}/usermanager.cpp (100%) rename {server => libguh-core}/usermanager.h (100%) rename {server => libguh-core}/webserver.cpp (99%) rename {server => libguh-core}/webserver.h (100%) rename {server => libguh-core}/websocketserver.cpp (99%) rename {server => libguh-core}/websocketserver.h (100%) delete mode 100644 server/server.pri diff --git a/guh.pro b/guh.pro index 319fe59a..24142502 100644 --- a/guh.pro +++ b/guh.pro @@ -2,26 +2,11 @@ include(guh.pri) TEMPLATE=subdirs -SUBDIRS += libguh server plugins +SUBDIRS += libguh libguh-core server plugins -!disabletesting { - message("Building guh tests enabled") - SUBDIRS += tests - DEFINES += TESTING_ENABLED -} else { - message("Building guh tests disabled") -} - -# Bluetooth LE support -contains(DEFINES, BLUETOOTH_LE) { - message("Bluetooth LE available (Qt $${QT_VERSION}).") -} else { - message("Bluetooth LE not available (Qt $${QT_VERSION}).") -} - -server.depends = libguh plugins +server.depends = libguh libguh-core plugins plugins.depends = libguh -tests.depends = libguh +tests.depends = libguh libguh-core doc.depends = libguh server # Note: some how extraimages in qdocconf did not the trick @@ -32,7 +17,7 @@ doc.commands += cd $$top_srcdir/doc; qdoc config.qdocconf; cp -r images/* html/i licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir test.depends = licensecheck -test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh:$$top_builddir/tests/libguh-core make check +test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh-core:$$top_builddir/libguh make check QMAKE_EXTRA_TARGETS += licensecheck doc test diff --git a/server/bluetoothserver.cpp b/libguh-core/bluetoothserver.cpp similarity index 100% rename from server/bluetoothserver.cpp rename to libguh-core/bluetoothserver.cpp diff --git a/server/bluetoothserver.h b/libguh-core/bluetoothserver.h similarity index 100% rename from server/bluetoothserver.h rename to libguh-core/bluetoothserver.h diff --git a/server/certificategenerator.cpp b/libguh-core/certificategenerator.cpp similarity index 100% rename from server/certificategenerator.cpp rename to libguh-core/certificategenerator.cpp diff --git a/server/certificategenerator.h b/libguh-core/certificategenerator.h similarity index 100% rename from server/certificategenerator.h rename to libguh-core/certificategenerator.h diff --git a/server/guhconfiguration.cpp b/libguh-core/guhconfiguration.cpp similarity index 94% rename from server/guhconfiguration.cpp rename to libguh-core/guhconfiguration.cpp index e4f4d086..e586dd6e 100644 --- a/server/guhconfiguration.cpp +++ b/libguh-core/guhconfiguration.cpp @@ -46,7 +46,6 @@ GuhConfiguration::GuhConfiguration(QObject *parent) : GuhSettings settings(GuhSettings::SettingsRoleGlobal); -#ifndef TESTING_ENABLED // TcpServer bool createDefaults = !settings.childGroups().contains("TcpServer"); if (settings.childGroups().contains("TcpServer")) { @@ -143,34 +142,6 @@ GuhConfiguration::GuhConfiguration(QObject *parent) : m_webSocketServerConfigs[config.id] = config; storeServerConfig("WebSocketServer", config); } - - -#else - ServerConfiguration tcpConfig; - tcpConfig.id = "default"; - tcpConfig.address = QHostAddress("127.0.0.1"); - tcpConfig.port = 2222; - tcpConfig.sslEnabled = true; - tcpConfig.authenticationEnabled = true; - m_tcpServerConfigs[tcpConfig.id] = tcpConfig; - - WebServerConfiguration wsConfig; - wsConfig.id = "default"; - wsConfig.address = QHostAddress("127.0.0.1"); - wsConfig.port = 3333; - wsConfig.sslEnabled = true; - wsConfig.authenticationEnabled = true; - wsConfig.publicFolder = qApp->applicationDirPath(); - m_webServerConfigs[wsConfig.id] = wsConfig; - - ServerConfiguration wssConfig; - wssConfig.id = "default"; - wssConfig.address = QHostAddress("127.0.0.1"); - wssConfig.port = 4444; - wssConfig.sslEnabled = true; - wssConfig.authenticationEnabled = true; - m_webSocketServerConfigs[wssConfig.id] = wssConfig; -#endif } QUuid GuhConfiguration::serverUuid() const diff --git a/server/guhconfiguration.h b/libguh-core/guhconfiguration.h similarity index 100% rename from server/guhconfiguration.h rename to libguh-core/guhconfiguration.h diff --git a/server/guhcore.cpp b/libguh-core/guhcore.cpp similarity index 100% rename from server/guhcore.cpp rename to libguh-core/guhcore.cpp diff --git a/server/guhcore.h b/libguh-core/guhcore.h similarity index 100% rename from server/guhcore.h rename to libguh-core/guhcore.h diff --git a/server/httpreply.cpp b/libguh-core/httpreply.cpp similarity index 100% rename from server/httpreply.cpp rename to libguh-core/httpreply.cpp diff --git a/server/httpreply.h b/libguh-core/httpreply.h similarity index 100% rename from server/httpreply.h rename to libguh-core/httpreply.h diff --git a/server/httprequest.cpp b/libguh-core/httprequest.cpp similarity index 100% rename from server/httprequest.cpp rename to libguh-core/httprequest.cpp diff --git a/server/httprequest.h b/libguh-core/httprequest.h similarity index 100% rename from server/httprequest.h rename to libguh-core/httprequest.h diff --git a/server/jsonrpc/actionhandler.cpp b/libguh-core/jsonrpc/actionhandler.cpp similarity index 100% rename from server/jsonrpc/actionhandler.cpp rename to libguh-core/jsonrpc/actionhandler.cpp diff --git a/server/jsonrpc/actionhandler.h b/libguh-core/jsonrpc/actionhandler.h similarity index 100% rename from server/jsonrpc/actionhandler.h rename to libguh-core/jsonrpc/actionhandler.h diff --git a/server/jsonrpc/configurationhandler.cpp b/libguh-core/jsonrpc/configurationhandler.cpp similarity index 100% rename from server/jsonrpc/configurationhandler.cpp rename to libguh-core/jsonrpc/configurationhandler.cpp diff --git a/server/jsonrpc/configurationhandler.h b/libguh-core/jsonrpc/configurationhandler.h similarity index 100% rename from server/jsonrpc/configurationhandler.h rename to libguh-core/jsonrpc/configurationhandler.h diff --git a/server/jsonrpc/devicehandler.cpp b/libguh-core/jsonrpc/devicehandler.cpp similarity index 100% rename from server/jsonrpc/devicehandler.cpp rename to libguh-core/jsonrpc/devicehandler.cpp diff --git a/server/jsonrpc/devicehandler.h b/libguh-core/jsonrpc/devicehandler.h similarity index 100% rename from server/jsonrpc/devicehandler.h rename to libguh-core/jsonrpc/devicehandler.h diff --git a/server/jsonrpc/eventhandler.cpp b/libguh-core/jsonrpc/eventhandler.cpp similarity index 100% rename from server/jsonrpc/eventhandler.cpp rename to libguh-core/jsonrpc/eventhandler.cpp diff --git a/server/jsonrpc/eventhandler.h b/libguh-core/jsonrpc/eventhandler.h similarity index 100% rename from server/jsonrpc/eventhandler.h rename to libguh-core/jsonrpc/eventhandler.h diff --git a/server/jsonrpc/jsonhandler.cpp b/libguh-core/jsonrpc/jsonhandler.cpp similarity index 100% rename from server/jsonrpc/jsonhandler.cpp rename to libguh-core/jsonrpc/jsonhandler.cpp diff --git a/server/jsonrpc/jsonhandler.h b/libguh-core/jsonrpc/jsonhandler.h similarity index 100% rename from server/jsonrpc/jsonhandler.h rename to libguh-core/jsonrpc/jsonhandler.h diff --git a/server/jsonrpc/jsonrpcserver.cpp b/libguh-core/jsonrpc/jsonrpcserver.cpp similarity index 100% rename from server/jsonrpc/jsonrpcserver.cpp rename to libguh-core/jsonrpc/jsonrpcserver.cpp diff --git a/server/jsonrpc/jsonrpcserver.h b/libguh-core/jsonrpc/jsonrpcserver.h similarity index 100% rename from server/jsonrpc/jsonrpcserver.h rename to libguh-core/jsonrpc/jsonrpcserver.h diff --git a/server/jsonrpc/jsontypes.cpp b/libguh-core/jsonrpc/jsontypes.cpp similarity index 100% rename from server/jsonrpc/jsontypes.cpp rename to libguh-core/jsonrpc/jsontypes.cpp diff --git a/server/jsonrpc/jsontypes.h b/libguh-core/jsonrpc/jsontypes.h similarity index 100% rename from server/jsonrpc/jsontypes.h rename to libguh-core/jsonrpc/jsontypes.h diff --git a/server/jsonrpc/logginghandler.cpp b/libguh-core/jsonrpc/logginghandler.cpp similarity index 100% rename from server/jsonrpc/logginghandler.cpp rename to libguh-core/jsonrpc/logginghandler.cpp diff --git a/server/jsonrpc/logginghandler.h b/libguh-core/jsonrpc/logginghandler.h similarity index 100% rename from server/jsonrpc/logginghandler.h rename to libguh-core/jsonrpc/logginghandler.h diff --git a/server/jsonrpc/networkmanagerhandler.cpp b/libguh-core/jsonrpc/networkmanagerhandler.cpp similarity index 100% rename from server/jsonrpc/networkmanagerhandler.cpp rename to libguh-core/jsonrpc/networkmanagerhandler.cpp diff --git a/server/jsonrpc/networkmanagerhandler.h b/libguh-core/jsonrpc/networkmanagerhandler.h similarity index 100% rename from server/jsonrpc/networkmanagerhandler.h rename to libguh-core/jsonrpc/networkmanagerhandler.h diff --git a/server/jsonrpc/ruleshandler.cpp b/libguh-core/jsonrpc/ruleshandler.cpp similarity index 100% rename from server/jsonrpc/ruleshandler.cpp rename to libguh-core/jsonrpc/ruleshandler.cpp diff --git a/server/jsonrpc/ruleshandler.h b/libguh-core/jsonrpc/ruleshandler.h similarity index 100% rename from server/jsonrpc/ruleshandler.h rename to libguh-core/jsonrpc/ruleshandler.h diff --git a/server/jsonrpc/statehandler.cpp b/libguh-core/jsonrpc/statehandler.cpp similarity index 100% rename from server/jsonrpc/statehandler.cpp rename to libguh-core/jsonrpc/statehandler.cpp diff --git a/server/jsonrpc/statehandler.h b/libguh-core/jsonrpc/statehandler.h similarity index 100% rename from server/jsonrpc/statehandler.h rename to libguh-core/jsonrpc/statehandler.h diff --git a/libguh-core/libguh-core.pro b/libguh-core/libguh-core.pro new file mode 100644 index 00000000..5f1d668c --- /dev/null +++ b/libguh-core/libguh-core.pro @@ -0,0 +1,122 @@ +TEMPLATE = lib +TARGET = guh-core + +include(../guh.pri) + +QT += sql +INCLUDEPATH += $$top_srcdir/libguh jsonrpc +LIBS += -L$$top_builddir/libguh/ -lguh -lssl -lcrypto + +target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH') +INSTALLS += target + +# icons for the webserver +RESOURCES += $$top_srcdir/icons.qrc + +HEADERS += $$top_srcdir/libguh-core/guhcore.h \ + $$top_srcdir/libguh-core/tcpserver.h \ + $$top_srcdir/libguh-core/mocktcpserver.h \ + $$top_srcdir/libguh-core/ruleengine.h \ + $$top_srcdir/libguh-core/rule.h \ + $$top_srcdir/libguh-core/stateevaluator.h \ + $$top_srcdir/libguh-core/webserver.h \ + $$top_srcdir/libguh-core/transportinterface.h \ + $$top_srcdir/libguh-core/servermanager.h \ + $$top_srcdir/libguh-core/httprequest.h \ + $$top_srcdir/libguh-core/websocketserver.h \ + $$top_srcdir/libguh-core/httpreply.h \ + $$top_srcdir/libguh-core/guhconfiguration.h \ + $$top_srcdir/libguh-core/bluetoothserver.h \ + $$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.h \ + $$top_srcdir/libguh-core/jsonrpc/jsonhandler.h \ + $$top_srcdir/libguh-core/jsonrpc/devicehandler.h \ + $$top_srcdir/libguh-core/jsonrpc/jsontypes.h \ + $$top_srcdir/libguh-core/jsonrpc/ruleshandler.h \ + $$top_srcdir/libguh-core/jsonrpc/actionhandler.h \ + $$top_srcdir/libguh-core/jsonrpc/eventhandler.h \ + $$top_srcdir/libguh-core/jsonrpc/statehandler.h \ + $$top_srcdir/libguh-core/jsonrpc/logginghandler.h \ + $$top_srcdir/libguh-core/jsonrpc/configurationhandler.h \ + $$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.h \ + $$top_srcdir/libguh-core/logging/logging.h \ + $$top_srcdir/libguh-core/logging/logengine.h \ + $$top_srcdir/libguh-core/logging/logfilter.h \ + $$top_srcdir/libguh-core/logging/logentry.h \ + $$top_srcdir/libguh-core/rest/restserver.h \ + $$top_srcdir/libguh-core/rest/restresource.h \ + $$top_srcdir/libguh-core/rest/devicesresource.h \ + $$top_srcdir/libguh-core/rest/deviceclassesresource.h \ + $$top_srcdir/libguh-core/rest/vendorsresource.h \ + $$top_srcdir/libguh-core/rest/logsresource.h \ + $$top_srcdir/libguh-core/rest/pluginsresource.h \ + $$top_srcdir/libguh-core/rest/rulesresource.h \ + $$top_srcdir/libguh-core/time/timedescriptor.h \ + $$top_srcdir/libguh-core/time/calendaritem.h \ + $$top_srcdir/libguh-core/time/repeatingoption.h \ + $$top_srcdir/libguh-core/time/timeeventitem.h \ + $$top_srcdir/libguh-core/time/timemanager.h \ + $$top_srcdir/libguh-core/networkmanager/dbus-interfaces.h \ + $$top_srcdir/libguh-core/networkmanager/networkmanager.h \ + $$top_srcdir/libguh-core/networkmanager/networkdevice.h \ + $$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.h \ + $$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.h \ + $$top_srcdir/libguh-core/networkmanager/networksettings.h \ + $$top_srcdir/libguh-core/networkmanager/networkconnection.h \ + $$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.h \ + $$top_srcdir/libguh-core/usermanager.h \ + $$top_srcdir/libguh-core/tokeninfo.h \ + $$PWD/certificategenerator.h + + +SOURCES += $$top_srcdir/libguh-core/guhcore.cpp \ + $$top_srcdir/libguh-core/tcpserver.cpp \ + $$top_srcdir/libguh-core/mocktcpserver.cpp \ + $$top_srcdir/libguh-core/ruleengine.cpp \ + $$top_srcdir/libguh-core/rule.cpp \ + $$top_srcdir/libguh-core/stateevaluator.cpp \ + $$top_srcdir/libguh-core/webserver.cpp \ + $$top_srcdir/libguh-core/transportinterface.cpp \ + $$top_srcdir/libguh-core/servermanager.cpp \ + $$top_srcdir/libguh-core/httprequest.cpp \ + $$top_srcdir/libguh-core/websocketserver.cpp \ + $$top_srcdir/libguh-core/httpreply.cpp \ + $$top_srcdir/libguh-core/guhconfiguration.cpp \ + $$top_srcdir/libguh-core/bluetoothserver.cpp \ + $$top_srcdir/libguh-core/jsonrpc/jsonrpcserver.cpp \ + $$top_srcdir/libguh-core/jsonrpc/jsonhandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/devicehandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/jsontypes.cpp \ + $$top_srcdir/libguh-core/jsonrpc/ruleshandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/actionhandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/eventhandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/statehandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/logginghandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/configurationhandler.cpp \ + $$top_srcdir/libguh-core/jsonrpc/networkmanagerhandler.cpp \ + $$top_srcdir/libguh-core/logging/logengine.cpp \ + $$top_srcdir/libguh-core/logging/logfilter.cpp \ + $$top_srcdir/libguh-core/logging/logentry.cpp \ + $$top_srcdir/libguh-core/rest/restserver.cpp \ + $$top_srcdir/libguh-core/rest/restresource.cpp \ + $$top_srcdir/libguh-core/rest/devicesresource.cpp \ + $$top_srcdir/libguh-core/rest/deviceclassesresource.cpp \ + $$top_srcdir/libguh-core/rest/vendorsresource.cpp \ + $$top_srcdir/libguh-core/rest/logsresource.cpp \ + $$top_srcdir/libguh-core/rest/pluginsresource.cpp \ + $$top_srcdir/libguh-core/rest/rulesresource.cpp \ + $$top_srcdir/libguh-core/time/timedescriptor.cpp \ + $$top_srcdir/libguh-core/time/calendaritem.cpp \ + $$top_srcdir/libguh-core/time/repeatingoption.cpp \ + $$top_srcdir/libguh-core/time/timeeventitem.cpp \ + $$top_srcdir/libguh-core/time/timemanager.cpp \ + $$top_srcdir/libguh-core/networkmanager/networkmanager.cpp \ + $$top_srcdir/libguh-core/networkmanager/networkdevice.cpp \ + $$top_srcdir/libguh-core/networkmanager/wirelessaccesspoint.cpp \ + $$top_srcdir/libguh-core/networkmanager/wirelessnetworkdevice.cpp \ + $$top_srcdir/libguh-core/networkmanager/networksettings.cpp \ + $$top_srcdir/libguh-core/networkmanager/networkconnection.cpp \ + $$top_srcdir/libguh-core/networkmanager/wirednetworkdevice.cpp \ + $$top_srcdir/libguh-core/usermanager.cpp \ + $$top_srcdir/libguh-core/tokeninfo.cpp \ + $$PWD/certificategenerator.cpp + diff --git a/server/logging/logengine.cpp b/libguh-core/logging/logengine.cpp similarity index 100% rename from server/logging/logengine.cpp rename to libguh-core/logging/logengine.cpp diff --git a/server/logging/logengine.h b/libguh-core/logging/logengine.h similarity index 100% rename from server/logging/logengine.h rename to libguh-core/logging/logengine.h diff --git a/server/logging/logentry.cpp b/libguh-core/logging/logentry.cpp similarity index 100% rename from server/logging/logentry.cpp rename to libguh-core/logging/logentry.cpp diff --git a/server/logging/logentry.h b/libguh-core/logging/logentry.h similarity index 100% rename from server/logging/logentry.h rename to libguh-core/logging/logentry.h diff --git a/server/logging/logfilter.cpp b/libguh-core/logging/logfilter.cpp similarity index 100% rename from server/logging/logfilter.cpp rename to libguh-core/logging/logfilter.cpp diff --git a/server/logging/logfilter.h b/libguh-core/logging/logfilter.h similarity index 100% rename from server/logging/logfilter.h rename to libguh-core/logging/logfilter.h diff --git a/server/logging/logging.h b/libguh-core/logging/logging.h similarity index 100% rename from server/logging/logging.h rename to libguh-core/logging/logging.h diff --git a/server/logging/logsource.cpp b/libguh-core/logging/logsource.cpp similarity index 100% rename from server/logging/logsource.cpp rename to libguh-core/logging/logsource.cpp diff --git a/server/logging/logsource.h b/libguh-core/logging/logsource.h similarity index 100% rename from server/logging/logsource.h rename to libguh-core/logging/logsource.h diff --git a/tests/auto/mocktcpserver.cpp b/libguh-core/mocktcpserver.cpp similarity index 100% rename from tests/auto/mocktcpserver.cpp rename to libguh-core/mocktcpserver.cpp diff --git a/tests/auto/mocktcpserver.h b/libguh-core/mocktcpserver.h similarity index 100% rename from tests/auto/mocktcpserver.h rename to libguh-core/mocktcpserver.h diff --git a/server/networkmanager/dbus-interfaces.h b/libguh-core/networkmanager/dbus-interfaces.h similarity index 100% rename from server/networkmanager/dbus-interfaces.h rename to libguh-core/networkmanager/dbus-interfaces.h diff --git a/server/networkmanager/networkconnection.cpp b/libguh-core/networkmanager/networkconnection.cpp similarity index 100% rename from server/networkmanager/networkconnection.cpp rename to libguh-core/networkmanager/networkconnection.cpp diff --git a/server/networkmanager/networkconnection.h b/libguh-core/networkmanager/networkconnection.h similarity index 100% rename from server/networkmanager/networkconnection.h rename to libguh-core/networkmanager/networkconnection.h diff --git a/server/networkmanager/networkdevice.cpp b/libguh-core/networkmanager/networkdevice.cpp similarity index 100% rename from server/networkmanager/networkdevice.cpp rename to libguh-core/networkmanager/networkdevice.cpp diff --git a/server/networkmanager/networkdevice.h b/libguh-core/networkmanager/networkdevice.h similarity index 100% rename from server/networkmanager/networkdevice.h rename to libguh-core/networkmanager/networkdevice.h diff --git a/server/networkmanager/networkmanager.cpp b/libguh-core/networkmanager/networkmanager.cpp similarity index 100% rename from server/networkmanager/networkmanager.cpp rename to libguh-core/networkmanager/networkmanager.cpp diff --git a/server/networkmanager/networkmanager.h b/libguh-core/networkmanager/networkmanager.h similarity index 100% rename from server/networkmanager/networkmanager.h rename to libguh-core/networkmanager/networkmanager.h diff --git a/server/networkmanager/networksettings.cpp b/libguh-core/networkmanager/networksettings.cpp similarity index 100% rename from server/networkmanager/networksettings.cpp rename to libguh-core/networkmanager/networksettings.cpp diff --git a/server/networkmanager/networksettings.h b/libguh-core/networkmanager/networksettings.h similarity index 100% rename from server/networkmanager/networksettings.h rename to libguh-core/networkmanager/networksettings.h diff --git a/server/networkmanager/wirednetworkdevice.cpp b/libguh-core/networkmanager/wirednetworkdevice.cpp similarity index 100% rename from server/networkmanager/wirednetworkdevice.cpp rename to libguh-core/networkmanager/wirednetworkdevice.cpp diff --git a/server/networkmanager/wirednetworkdevice.h b/libguh-core/networkmanager/wirednetworkdevice.h similarity index 100% rename from server/networkmanager/wirednetworkdevice.h rename to libguh-core/networkmanager/wirednetworkdevice.h diff --git a/server/networkmanager/wirelessaccesspoint.cpp b/libguh-core/networkmanager/wirelessaccesspoint.cpp similarity index 100% rename from server/networkmanager/wirelessaccesspoint.cpp rename to libguh-core/networkmanager/wirelessaccesspoint.cpp diff --git a/server/networkmanager/wirelessaccesspoint.h b/libguh-core/networkmanager/wirelessaccesspoint.h similarity index 100% rename from server/networkmanager/wirelessaccesspoint.h rename to libguh-core/networkmanager/wirelessaccesspoint.h diff --git a/server/networkmanager/wirelessnetworkdevice.cpp b/libguh-core/networkmanager/wirelessnetworkdevice.cpp similarity index 100% rename from server/networkmanager/wirelessnetworkdevice.cpp rename to libguh-core/networkmanager/wirelessnetworkdevice.cpp diff --git a/server/networkmanager/wirelessnetworkdevice.h b/libguh-core/networkmanager/wirelessnetworkdevice.h similarity index 100% rename from server/networkmanager/wirelessnetworkdevice.h rename to libguh-core/networkmanager/wirelessnetworkdevice.h diff --git a/server/rest/deviceclassesresource.cpp b/libguh-core/rest/deviceclassesresource.cpp similarity index 100% rename from server/rest/deviceclassesresource.cpp rename to libguh-core/rest/deviceclassesresource.cpp diff --git a/server/rest/deviceclassesresource.h b/libguh-core/rest/deviceclassesresource.h similarity index 100% rename from server/rest/deviceclassesresource.h rename to libguh-core/rest/deviceclassesresource.h diff --git a/server/rest/devicesresource.cpp b/libguh-core/rest/devicesresource.cpp similarity index 100% rename from server/rest/devicesresource.cpp rename to libguh-core/rest/devicesresource.cpp diff --git a/server/rest/devicesresource.h b/libguh-core/rest/devicesresource.h similarity index 100% rename from server/rest/devicesresource.h rename to libguh-core/rest/devicesresource.h diff --git a/server/rest/logsresource.cpp b/libguh-core/rest/logsresource.cpp similarity index 100% rename from server/rest/logsresource.cpp rename to libguh-core/rest/logsresource.cpp diff --git a/server/rest/logsresource.h b/libguh-core/rest/logsresource.h similarity index 100% rename from server/rest/logsresource.h rename to libguh-core/rest/logsresource.h diff --git a/server/rest/pluginsresource.cpp b/libguh-core/rest/pluginsresource.cpp similarity index 100% rename from server/rest/pluginsresource.cpp rename to libguh-core/rest/pluginsresource.cpp diff --git a/server/rest/pluginsresource.h b/libguh-core/rest/pluginsresource.h similarity index 100% rename from server/rest/pluginsresource.h rename to libguh-core/rest/pluginsresource.h diff --git a/server/rest/restresource.cpp b/libguh-core/rest/restresource.cpp similarity index 100% rename from server/rest/restresource.cpp rename to libguh-core/rest/restresource.cpp diff --git a/server/rest/restresource.h b/libguh-core/rest/restresource.h similarity index 100% rename from server/rest/restresource.h rename to libguh-core/rest/restresource.h diff --git a/server/rest/restserver.cpp b/libguh-core/rest/restserver.cpp similarity index 100% rename from server/rest/restserver.cpp rename to libguh-core/rest/restserver.cpp diff --git a/server/rest/restserver.h b/libguh-core/rest/restserver.h similarity index 100% rename from server/rest/restserver.h rename to libguh-core/rest/restserver.h diff --git a/server/rest/rulesresource.cpp b/libguh-core/rest/rulesresource.cpp similarity index 100% rename from server/rest/rulesresource.cpp rename to libguh-core/rest/rulesresource.cpp diff --git a/server/rest/rulesresource.h b/libguh-core/rest/rulesresource.h similarity index 100% rename from server/rest/rulesresource.h rename to libguh-core/rest/rulesresource.h diff --git a/server/rest/vendorsresource.cpp b/libguh-core/rest/vendorsresource.cpp similarity index 100% rename from server/rest/vendorsresource.cpp rename to libguh-core/rest/vendorsresource.cpp diff --git a/server/rest/vendorsresource.h b/libguh-core/rest/vendorsresource.h similarity index 100% rename from server/rest/vendorsresource.h rename to libguh-core/rest/vendorsresource.h diff --git a/server/rule.cpp b/libguh-core/rule.cpp similarity index 100% rename from server/rule.cpp rename to libguh-core/rule.cpp diff --git a/server/rule.h b/libguh-core/rule.h similarity index 100% rename from server/rule.h rename to libguh-core/rule.h diff --git a/server/ruleengine.cpp b/libguh-core/ruleengine.cpp similarity index 100% rename from server/ruleengine.cpp rename to libguh-core/ruleengine.cpp diff --git a/server/ruleengine.h b/libguh-core/ruleengine.h similarity index 100% rename from server/ruleengine.h rename to libguh-core/ruleengine.h diff --git a/server/servermanager.cpp b/libguh-core/servermanager.cpp similarity index 97% rename from server/servermanager.cpp rename to libguh-core/servermanager.cpp index 36ff2742..d3105a65 100644 --- a/server/servermanager.cpp +++ b/libguh-core/servermanager.cpp @@ -92,18 +92,15 @@ ServerManager::ServerManager(GuhConfiguration* configuration, QObject *parent) : // Transports -#ifdef TESTING_ENABLED MockTcpServer *tcpServer = new MockTcpServer(this); m_jsonServer->registerTransportInterface(tcpServer, true); tcpServer->startServer(); -#else foreach (const ServerConfiguration &config, configuration->tcpServerConfigurations()) { TcpServer *tcpServer = new TcpServer(config, m_sslConfiguration, this); m_jsonServer->registerTransportInterface(tcpServer, config.authenticationEnabled); m_tcpServers.insert(config.id, tcpServer); tcpServer->startServer(); } -#endif foreach (const ServerConfiguration &config, configuration->webSocketServerConfigurations()) { WebSocketServer *webSocketServer = new WebSocketServer(config, m_sslConfiguration, this); @@ -149,9 +146,13 @@ BluetoothServer *ServerManager::bluetoothServer() const return m_bluetoothServer; } +MockTcpServer *ServerManager::mockTcpServer() const +{ + return m_mockTcpServer; +} + void ServerManager::tcpServerConfigurationChanged(const QString &id) { -#ifndef TESTING_ENABLED ServerConfiguration config = GuhCore::instance()->configuration()->tcpServerConfigurations().value(id); TcpServer *server = m_tcpServers.value(id); if (server) { @@ -165,14 +166,10 @@ void ServerManager::tcpServerConfigurationChanged(const QString &id) } m_jsonServer->registerTransportInterface(server, config.authenticationEnabled); server->startServer(); -#else - qWarning() << "Configure called for" << id << "but disabled in testing"; -#endif } void ServerManager::tcpServerConfigurationRemoved(const QString &id) { -#ifndef TESTING_ENABLED if (!m_tcpServers.contains(id)) { qWarning(dcConnection) << "Received a TCP Server config removed event but don't have a TCP Server instance for it."; return; @@ -181,9 +178,6 @@ void ServerManager::tcpServerConfigurationRemoved(const QString &id) m_jsonServer->unregisterTransportInterface(server); server->stopServer(); server->deleteLater(); -#else - qWarning() << "Delete configuration called for" << id << "but disabled in testing"; -#endif } void ServerManager::webSocketServerConfigurationChanged(const QString &id) diff --git a/server/servermanager.h b/libguh-core/servermanager.h similarity index 95% rename from server/servermanager.h rename to libguh-core/servermanager.h index f415c5c5..c0ccf9a6 100644 --- a/server/servermanager.h +++ b/libguh-core/servermanager.h @@ -28,12 +28,8 @@ #include "rest/restserver.h" #include "websocketserver.h" #include "bluetoothserver.h" - -#ifndef TESTING_ENABLED #include "tcpserver.h" -#else #include "mocktcpserver.h" -#endif class QSslConfiguration; class QSslCertificate; @@ -56,11 +52,8 @@ public: WebSocketServer* webSocketServer() const; BluetoothServer* bluetoothServer() const; -#ifdef TESTING_ENABLED - MockTcpServer *tcpServer() const; -#else TcpServer *tcpServer() const; -#endif + MockTcpServer *mockTcpServer() const; private slots: void tcpServerConfigurationChanged(const QString &id); @@ -76,11 +69,10 @@ private: RestServer *m_restServer; BluetoothServer *m_bluetoothServer; -#ifndef TESTING_ENABLED QHash m_tcpServers; -#endif QHash m_webSocketServers; QHash m_webServers; + MockTcpServer *m_mockTcpServer; // Encrytption and stuff QSslConfiguration m_sslConfiguration; diff --git a/server/stateevaluator.cpp b/libguh-core/stateevaluator.cpp similarity index 100% rename from server/stateevaluator.cpp rename to libguh-core/stateevaluator.cpp diff --git a/server/stateevaluator.h b/libguh-core/stateevaluator.h similarity index 100% rename from server/stateevaluator.h rename to libguh-core/stateevaluator.h diff --git a/server/tcpserver.cpp b/libguh-core/tcpserver.cpp similarity index 98% rename from server/tcpserver.cpp rename to libguh-core/tcpserver.cpp index ce5a285b..eb8fb361 100644 --- a/server/tcpserver.cpp +++ b/libguh-core/tcpserver.cpp @@ -50,10 +50,8 @@ TcpServer::TcpServer(const ServerConfiguration &configuration, const QSslConfigu m_server(NULL), m_sslConfig(sslConfiguration) { -#ifndef TESTING_ENABLED m_avahiService = new QtAvahiService(this); connect(m_avahiService, &QtAvahiService::serviceStateChanged, this, &TcpServer::onAvahiServiceStateChanged); -#endif } /*! Destructor of this \l{TcpServer}. */ @@ -152,7 +150,6 @@ bool TcpServer::startServer() return false; } -#ifndef TESTING_ENABLED // Note: reversed order QHash txt; txt.insert("jsonrpcVersion", JSON_PROTOCOL_VERSION); @@ -161,7 +158,6 @@ bool TcpServer::startServer() txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString()); txt.insert("name", GuhCore::instance()->configuration()->serverName()); m_avahiService->registerService("guhIO", configuration().port, "_jsonrpc._tcp", txt); -#endif qCDebug(dcConnection) << "Started Tcp server on" << m_server->serverAddress().toString() << m_server->serverPort(); connect(m_server, SIGNAL(clientConnected(QSslSocket *)), SLOT(onClientConnected(QSslSocket *))); @@ -176,10 +172,8 @@ bool TcpServer::startServer() */ bool TcpServer::stopServer() { -#ifndef TESTING_ENABLED if (m_avahiService) m_avahiService->resetService(); -#endif if (!m_server) return true; diff --git a/server/tcpserver.h b/libguh-core/tcpserver.h similarity index 100% rename from server/tcpserver.h rename to libguh-core/tcpserver.h diff --git a/server/time/calendaritem.cpp b/libguh-core/time/calendaritem.cpp similarity index 100% rename from server/time/calendaritem.cpp rename to libguh-core/time/calendaritem.cpp diff --git a/server/time/calendaritem.h b/libguh-core/time/calendaritem.h similarity index 100% rename from server/time/calendaritem.h rename to libguh-core/time/calendaritem.h diff --git a/server/time/repeatingoption.cpp b/libguh-core/time/repeatingoption.cpp similarity index 100% rename from server/time/repeatingoption.cpp rename to libguh-core/time/repeatingoption.cpp diff --git a/server/time/repeatingoption.h b/libguh-core/time/repeatingoption.h similarity index 100% rename from server/time/repeatingoption.h rename to libguh-core/time/repeatingoption.h diff --git a/server/time/timedescriptor.cpp b/libguh-core/time/timedescriptor.cpp similarity index 100% rename from server/time/timedescriptor.cpp rename to libguh-core/time/timedescriptor.cpp diff --git a/server/time/timedescriptor.h b/libguh-core/time/timedescriptor.h similarity index 100% rename from server/time/timedescriptor.h rename to libguh-core/time/timedescriptor.h diff --git a/server/time/timeeventitem.cpp b/libguh-core/time/timeeventitem.cpp similarity index 100% rename from server/time/timeeventitem.cpp rename to libguh-core/time/timeeventitem.cpp diff --git a/server/time/timeeventitem.h b/libguh-core/time/timeeventitem.h similarity index 100% rename from server/time/timeeventitem.h rename to libguh-core/time/timeeventitem.h diff --git a/server/time/timemanager.cpp b/libguh-core/time/timemanager.cpp similarity index 96% rename from server/time/timemanager.cpp rename to libguh-core/time/timemanager.cpp index 861d811b..72682a9b 100644 --- a/server/time/timemanager.cpp +++ b/libguh-core/time/timemanager.cpp @@ -107,20 +107,20 @@ QList TimeManager::availableTimeZones() const return QTimeZone::availableTimeZoneIds(); } -#ifdef TESTING_ENABLED void TimeManager::stopTimer() { + qWarning(dcTimeManager()) << "TimeManager timer stopped. You should only see this in tests."; // Stop clock (used for testing) m_guhTimer->stop(); } void TimeManager::setTime(const QDateTime &dateTime) { + qWarning(dcTimeManager()) << "TimeManager time changed. You should only see this in tests."; // This method will only be called for testing to set the guhIO intern time emit tick(); emit dateTimeChanged(dateTime); } -#endif void TimeManager::guhTimeout() { diff --git a/server/time/timemanager.h b/libguh-core/time/timemanager.h similarity index 98% rename from server/time/timemanager.h rename to libguh-core/time/timemanager.h index 5dfb202a..474d7410 100644 --- a/server/time/timemanager.h +++ b/libguh-core/time/timemanager.h @@ -43,10 +43,8 @@ public: QList availableTimeZones() const; -#ifdef TESTING_ENABLED void stopTimer(); void setTime(const QDateTime &dateTime); -#endif private: QTimeZone m_timeZone; diff --git a/server/tokeninfo.cpp b/libguh-core/tokeninfo.cpp similarity index 100% rename from server/tokeninfo.cpp rename to libguh-core/tokeninfo.cpp diff --git a/server/tokeninfo.h b/libguh-core/tokeninfo.h similarity index 100% rename from server/tokeninfo.h rename to libguh-core/tokeninfo.h diff --git a/server/transportinterface.cpp b/libguh-core/transportinterface.cpp similarity index 100% rename from server/transportinterface.cpp rename to libguh-core/transportinterface.cpp diff --git a/server/transportinterface.h b/libguh-core/transportinterface.h similarity index 100% rename from server/transportinterface.h rename to libguh-core/transportinterface.h diff --git a/server/usermanager.cpp b/libguh-core/usermanager.cpp similarity index 100% rename from server/usermanager.cpp rename to libguh-core/usermanager.cpp diff --git a/server/usermanager.h b/libguh-core/usermanager.h similarity index 100% rename from server/usermanager.h rename to libguh-core/usermanager.h diff --git a/server/webserver.cpp b/libguh-core/webserver.cpp similarity index 99% rename from server/webserver.cpp rename to libguh-core/webserver.cpp index a20ff0d0..ce6562ff 100644 --- a/server/webserver.cpp +++ b/libguh-core/webserver.cpp @@ -108,10 +108,8 @@ WebServer::WebServer(const WebServerConfiguration &configuration, const QSslConf } qCDebug(dcWebServer) << "Using public folder" << QDir(m_configuration.publicFolder).canonicalPath(); -#ifndef TESTING_ENABLED m_avahiService = new QtAvahiService(this); connect(m_avahiService, &QtAvahiService::serviceStateChanged, this, &WebServer::onAvahiServiceStateChanged); -#endif } /*! Destructor of this \l{WebServer}. */ @@ -517,7 +515,6 @@ bool WebServer::startServer() qCDebug(dcConnection) << "Started webserver on" << QString("http://%1:%2").arg(m_configuration.address.toString()).arg(m_configuration.port); } -#ifndef TESTING_ENABLED // Note: reversed order QHash txt; txt.insert("jsonrpcVersion", JSON_PROTOCOL_VERSION); @@ -526,7 +523,6 @@ bool WebServer::startServer() txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString()); txt.insert("name", GuhCore::instance()->configuration()->serverName()); m_avahiService->registerService("guhIO", m_configuration.port, "_http._tcp", txt); -#endif m_enabled = true; return true; @@ -535,10 +531,8 @@ bool WebServer::startServer() /*! Returns true if this \l{WebServer} stopped successfully. */ bool WebServer::stopServer() { -#ifndef TESTING_ENABLED if (m_avahiService) m_avahiService->resetService(); -#endif foreach (QSslSocket *client, m_clientList.values()) client->close(); diff --git a/server/webserver.h b/libguh-core/webserver.h similarity index 100% rename from server/webserver.h rename to libguh-core/webserver.h diff --git a/server/websocketserver.cpp b/libguh-core/websocketserver.cpp similarity index 99% rename from server/websocketserver.cpp rename to libguh-core/websocketserver.cpp index c9c7d67f..169735b2 100644 --- a/server/websocketserver.cpp +++ b/libguh-core/websocketserver.cpp @@ -66,10 +66,8 @@ WebSocketServer::WebSocketServer(const ServerConfiguration &configuration, const m_sslConfiguration(sslConfiguration), m_enabled(false) { -#ifndef TESTING_ENABLED m_avahiService = new QtAvahiService(this); connect(m_avahiService, &QtAvahiService::serviceStateChanged, this, &WebSocketServer::onAvahiServiceStateChanged); -#endif } /*! Destructor of this \l{WebSocketServer}. */ @@ -220,7 +218,6 @@ bool WebSocketServer::startServer() qCDebug(dcConnection) << "Started websocket server" << m_server->serverName() << QString("on wss://%1:%2").arg(m_server->serverAddress().toString()).arg(configuration().port); } -#ifndef TESTING_ENABLED // Note: reversed order QHash txt; txt.insert("jsonrpcVersion", JSON_PROTOCOL_VERSION); @@ -229,7 +226,6 @@ bool WebSocketServer::startServer() txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString()); txt.insert("name", GuhCore::instance()->configuration()->serverName()); m_avahiService->registerService("guhIO", configuration().port, "_ws._tcp", txt); -#endif return true; } @@ -240,10 +236,8 @@ bool WebSocketServer::startServer() */ bool WebSocketServer::stopServer() { -#ifndef TESTING_ENABLED if (m_avahiService) m_avahiService->resetService(); -#endif foreach (QWebSocket *client, m_clientList.values()) { client->close(QWebSocketProtocol::CloseCodeNormal, "Stop server"); diff --git a/server/websocketserver.h b/libguh-core/websocketserver.h similarity index 100% rename from server/websocketserver.h rename to libguh-core/websocketserver.h diff --git a/server/server.pri b/server/server.pri deleted file mode 100644 index c2eda1f2..00000000 --- a/server/server.pri +++ /dev/null @@ -1,120 +0,0 @@ -# icons for the webserver -RESOURCES += $$top_srcdir/icons.qrc - -HEADERS += $$top_srcdir/server/guhcore.h \ - $$top_srcdir/server/tcpserver.h \ - $$top_srcdir/server/ruleengine.h \ - $$top_srcdir/server/rule.h \ - $$top_srcdir/server/stateevaluator.h \ - $$top_srcdir/server/webserver.h \ - $$top_srcdir/server/transportinterface.h \ - $$top_srcdir/server/servermanager.h \ - $$top_srcdir/server/httprequest.h \ - $$top_srcdir/server/websocketserver.h \ - $$top_srcdir/server/httpreply.h \ - $$top_srcdir/server/guhconfiguration.h \ - $$top_srcdir/server/bluetoothserver.h \ - $$top_srcdir/server/jsonrpc/jsonrpcserver.h \ - $$top_srcdir/server/jsonrpc/jsonhandler.h \ - $$top_srcdir/server/jsonrpc/devicehandler.h \ - $$top_srcdir/server/jsonrpc/jsontypes.h \ - $$top_srcdir/server/jsonrpc/ruleshandler.h \ - $$top_srcdir/server/jsonrpc/actionhandler.h \ - $$top_srcdir/server/jsonrpc/eventhandler.h \ - $$top_srcdir/server/jsonrpc/statehandler.h \ - $$top_srcdir/server/jsonrpc/logginghandler.h \ - $$top_srcdir/server/jsonrpc/configurationhandler.h \ - $$top_srcdir/server/jsonrpc/networkmanagerhandler.h \ - $$top_srcdir/server/logging/logging.h \ - $$top_srcdir/server/logging/logengine.h \ - $$top_srcdir/server/logging/logfilter.h \ - $$top_srcdir/server/logging/logentry.h \ - $$top_srcdir/server/webserver.h \ - $$top_srcdir/server/transportinterface.h \ - $$top_srcdir/server/servermanager.h \ - $$top_srcdir/server/httprequest.h \ - $$top_srcdir/server/websocketserver.h \ - $$top_srcdir/server/httpreply.h \ - $$top_srcdir/server/rest/restserver.h \ - $$top_srcdir/server/rest/restresource.h \ - $$top_srcdir/server/rest/devicesresource.h \ - $$top_srcdir/server/rest/deviceclassesresource.h \ - $$top_srcdir/server/rest/vendorsresource.h \ - $$top_srcdir/server/rest/logsresource.h \ - $$top_srcdir/server/rest/pluginsresource.h \ - $$top_srcdir/server/rest/rulesresource.h \ - $$top_srcdir/server/time/timedescriptor.h \ - $$top_srcdir/server/time/calendaritem.h \ - $$top_srcdir/server/time/repeatingoption.h \ - $$top_srcdir/server/time/timeeventitem.h \ - $$top_srcdir/server/time/timemanager.h \ - $$top_srcdir/server/networkmanager/dbus-interfaces.h \ - $$top_srcdir/server/networkmanager/networkmanager.h \ - $$top_srcdir/server/networkmanager/networkdevice.h \ - $$top_srcdir/server/networkmanager/wirelessaccesspoint.h \ - $$top_srcdir/server/networkmanager/wirelessnetworkdevice.h \ - $$top_srcdir/server/networkmanager/networksettings.h \ - $$top_srcdir/server/networkmanager/networkconnection.h \ - $$top_srcdir/server/networkmanager/wirednetworkdevice.h \ - $$top_srcdir/server/usermanager.h \ - $$top_srcdir/server/tokeninfo.h \ - $$PWD/certificategenerator.h - - -SOURCES += $$top_srcdir/server/guhcore.cpp \ - $$top_srcdir/server/tcpserver.cpp \ - $$top_srcdir/server/ruleengine.cpp \ - $$top_srcdir/server/rule.cpp \ - $$top_srcdir/server/stateevaluator.cpp \ - $$top_srcdir/server/webserver.cpp \ - $$top_srcdir/server/transportinterface.cpp \ - $$top_srcdir/server/servermanager.cpp \ - $$top_srcdir/server/httprequest.cpp \ - $$top_srcdir/server/websocketserver.cpp \ - $$top_srcdir/server/httpreply.cpp \ - $$top_srcdir/server/guhconfiguration.cpp \ - $$top_srcdir/server/bluetoothserver.cpp \ - $$top_srcdir/server/jsonrpc/jsonrpcserver.cpp \ - $$top_srcdir/server/jsonrpc/jsonhandler.cpp \ - $$top_srcdir/server/jsonrpc/devicehandler.cpp \ - $$top_srcdir/server/jsonrpc/jsontypes.cpp \ - $$top_srcdir/server/jsonrpc/ruleshandler.cpp \ - $$top_srcdir/server/jsonrpc/actionhandler.cpp \ - $$top_srcdir/server/jsonrpc/eventhandler.cpp \ - $$top_srcdir/server/jsonrpc/statehandler.cpp \ - $$top_srcdir/server/jsonrpc/logginghandler.cpp \ - $$top_srcdir/server/jsonrpc/configurationhandler.cpp \ - $$top_srcdir/server/jsonrpc/networkmanagerhandler.cpp \ - $$top_srcdir/server/logging/logengine.cpp \ - $$top_srcdir/server/logging/logfilter.cpp \ - $$top_srcdir/server/logging/logentry.cpp \ - $$top_srcdir/server/webserver.cpp \ - $$top_srcdir/server/transportinterface.cpp \ - $$top_srcdir/server/servermanager.cpp \ - $$top_srcdir/server/httprequest.cpp \ - $$top_srcdir/server/websocketserver.cpp \ - $$top_srcdir/server/httpreply.cpp \ - $$top_srcdir/server/rest/restserver.cpp \ - $$top_srcdir/server/rest/restresource.cpp \ - $$top_srcdir/server/rest/devicesresource.cpp \ - $$top_srcdir/server/rest/deviceclassesresource.cpp \ - $$top_srcdir/server/rest/vendorsresource.cpp \ - $$top_srcdir/server/rest/logsresource.cpp \ - $$top_srcdir/server/rest/pluginsresource.cpp \ - $$top_srcdir/server/rest/rulesresource.cpp \ - $$top_srcdir/server/time/timedescriptor.cpp \ - $$top_srcdir/server/time/calendaritem.cpp \ - $$top_srcdir/server/time/repeatingoption.cpp \ - $$top_srcdir/server/time/timeeventitem.cpp \ - $$top_srcdir/server/time/timemanager.cpp \ - $$top_srcdir/server/networkmanager/networkmanager.cpp \ - $$top_srcdir/server/networkmanager/networkdevice.cpp \ - $$top_srcdir/server/networkmanager/wirelessaccesspoint.cpp \ - $$top_srcdir/server/networkmanager/wirelessnetworkdevice.cpp \ - $$top_srcdir/server/networkmanager/networksettings.cpp \ - $$top_srcdir/server/networkmanager/networkconnection.cpp \ - $$top_srcdir/server/networkmanager/wirednetworkdevice.cpp \ - $$top_srcdir/server/usermanager.cpp \ - $$top_srcdir/server/tokeninfo.cpp \ - $$PWD/certificategenerator.cpp - diff --git a/server/server.pro b/server/server.pro index aaad8c54..036b5669 100644 --- a/server/server.pro +++ b/server/server.pro @@ -3,14 +3,14 @@ include(../guh.pri) TARGET = guhd TEMPLATE = app -INCLUDEPATH += ../libguh jsonrpc +INCLUDEPATH += ../libguh-core ../libguh-core/jsonrpc ../libguh target.path = /usr/bin INSTALLS += target QT *= sql xml websockets bluetooth dbus -LIBS += -L$$top_builddir/libguh/ -lguh -lssl -lcrypto +LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/libguh-core -lguh-core # Translations TRANSLATIONS *= $$top_srcdir/translations/guhd-en_US.ts \ @@ -33,7 +33,6 @@ translations.files = $$[QT_SOURCE_TREE]/translations/*.qm INSTALLS += translations # Server files -include(server.pri) include(qtservice/qtservice.pri) SOURCES += main.cpp \ diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri index 5dec0742..317669a4 100644 --- a/tests/auto/autotests.pri +++ b/tests/auto/autotests.pri @@ -1,21 +1,17 @@ QT += testlib network sql CONFIG += testcase -DEFINES += TESTING_ENABLED - -INCLUDEPATH += $$top_srcdir/server/ \ - $$top_srcdir/server/jsonrpc \ - $$top_srcdir/libguh \ +INCLUDEPATH += $$top_srcdir/libguh \ + $$top_srcdir/libguh-core \ + $$top_srcdir/libguh-core/jsonrpc \ $$top_srcdir/tests/auto/ LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/mock/ \ - -L$$top_builddir/tests/libguh-core/ -lguh-core -lssl -lcrypto + -L$$top_builddir/libguh-core/ -lguh-core -lssl -lcrypto SOURCES += ../guhtestbase.cpp \ - ../mocktcpserver.cpp \ HEADERS += ../guhtestbase.h \ - ../mocktcpserver.h target.path = /usr/tests INSTALLS += target diff --git a/tests/tests.pro b/tests/tests.pro index 8ecc454e..2ede5161 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = auto libguh-core -auto.depends = libguh-core +SUBDIRS = auto