Merge branch 'subscriber-plugins' into bluez-plugin

14 files changed, 31 insertions, 152 deletions

diff --git a/configure.ac b/configure.ac
index 2e9628d9..2c890021 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AC_CONFIG_FILES([
         libcontextsubscriber/unit-tests/contextregistryinfo-xml-static/Makefile
         libcontextsubscriber/unit-tests/handlesignalrouter/Makefile
         libcontextsubscriber/unit-tests/propertyhandle/Makefile
-        libcontextsubscriber/unit-tests/propertyprovider/Makefile
+        libcontextsubscriber/unit-tests/provider/Makefile
         libcontextsubscriber/unit-tests/infoxmlkeysfinder/Makefile
         libcontextsubscriber/unit-tests/util/Makefile
         libcontextsubscriber/customer-tests/bluez-plugin/Makefile
diff --git a/libcontextsubscriber/.gitignore b/libcontextsubscriber/.gitignore
index 3c3973a1..655c27d3 100644
--- a/libcontextsubscriber/.gitignore
+++ b/libcontextsubscriber/.gitignore
@@ -30,7 +30,7 @@ contextsubscriber-1.0.pc
 /unit-tests/contextpropertyinfo-cdb-dynamic/contextpropertyinfounittest-cdb-dynamic
 /unit-tests/cdbreader/cdbreaderunittest
 /unit-tests/cdbwriter/cdbwriterunittest
-/unit-tests/propertyprovider/propertyprovider-unit-tests
+/unit-tests/provider/provider-unit-tests
 /unit-tests/propertyhandle/propertyhandle-unit-tests
 /unit-tests/handlesignalrouter/handlesignalrouter-unit-tests
 /unit-tests/contextregistryinfo-xml-dynamic/providers.context
diff --git a/libcontextsubscriber/configure.old b/libcontextsubscriber/configure.old
deleted file mode 100644
index d54290c6..00000000
--- a/libcontextsubscriber/configure.old
+++ /dev/null
@@ -1,120 +0,0 @@
-AC_INIT([libcontextsubscriber], [0.1], [marius.vollmer@nokia.com])
-AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 tar-ustar])
-AM_MAINTAINER_MODE
-
-AC_SUBST([USE_MAINTAINER_MODE])
-AC_CONFIG_MACRO_DIR([m4])
-
-AS_IF([test "$USE_MAINTAINER_MODE" = yes],
-	[withm_coverage=yes
-	 withm_doxygen=yes
-	 withm_debug=yes])
-
-AC_ARG_WITH([coverage],
-	[AS_HELP_STRING([--with-coverage],
-		[when running testcases, create coverage data by gcov and process by lcov])],
-	[with_coverage=$withval])
-
-AC_ARG_WITH([doxygen],
-	[AS_HELP_STRING([--with-doxygen],
-		[regenerate doxygen documentation by default in the doc subdir])],
-	[with_doxygen=$withval])
-
-AC_ARG_WITH([debug],
-	[AS_HELP_STRING([--with-debug],
-		[build with extra debugging logging])],
-	[with_debug=$withval])
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AM_PATH_PYTHON
-AS_IF([test "$with_coverage" = yes -o \( "$with_coverage" = "" -a "$withm_coverage" = yes \)],
-	    [AC_CHECK_PROGS([GCOV], [gcov], [:])
-	     AC_CHECK_PROGS([LCOV], [lcov], [:])
-	     if test "$GCOV" = : -o "$LCOV" = :; then
-	        AC_MSG_ERROR([For coverage you need lcov and gcov installed.  Probably --enable-maintainer-mode enabled coverage.])
-	     fi
-	     COV_CXXFLAGS="$COV_CXXFLAGS -ftest-coverage -fprofile-arcs -fno-elide-constructors"
-	     COV_LIBS="$COV_LIBS -lgcov"
-	     AC_SUBST([COV_CXXFLAGS])
-	     AC_SUBST([COV_LIBS])
-	     ],
-	    [AC_MSG_NOTICE([No coverage requested, enable it with --with-coverage])])
-AS_IF([test "$with_doxygen" = yes -o \( "$with_doxygen" = "" -a "$withm_doxygen" = yes \)],
-	    [AC_CHECK_PROGS([DOXYGEN], [doxygen], [:])
-	     if test "$DOXYGEN" = : ; then
-	        AC_MSG_ERROR([No doxygen found, probably --enable-maintainer-mode enabled doxygen.])
-	     fi
-	     AC_SUBST([DOXYGEN])
-	     ],
-	    [AC_MSG_NOTICE([Doxygen not enabled, enable it with --with-doxygen])])
-AS_IF([test "$with_debug" = yes -o \( "$with_debug" = "" -a "$withm_debug" = yes \)],
-	    [CONTEXT_LOG_CXXFLAGS=""],
-	    [CONTEXT_LOG_CXXFLAGS="-DCONTEXT_LOG_HIDE_TEST -DCONTEXT_LOG_HIDE_DEBUG"
-             AC_MSG_NOTICE([Building release mode, no extra debug logging])
-            ])
-AC_SUBST(CONTEXT_LOG_CXXFLAGS)
-
-# Checks for libraries.
-PKG_CHECK_MODULES([QtCore], [QtCore])
-PKG_CHECK_MODULES([QtDBus], [QtDBus])
-PKG_CHECK_MODULES([QtXml], [QtXml])
-MOC=`pkg-config QtCore --variable=moc_location`
-AC_CHECK_FILE([$MOC], [],
-   AC_MSG_ERROR([Can't find moc compiler: $MOC]))
-AC_SUBST([MOC])
-UIC=`pkg-config QtCore --variable=uic_location`
-AC_CHECK_FILE([$UIC], [],
-   AC_MSG_ERROR([Can't find uic compiler: $UIC]))
-AC_SUBST([UIC])
-RCC=`pkg-config QtCore --variable=exec_prefix`/bin/rcc
-AC_CHECK_FILE([$RCC], [],
-   AC_MSG_ERROR([Can't find rcc compiler: $RCC]))
-AC_SUBST([RCC])
-AC_SUBST([QtCore_CFLAGS])
-AC_SUBST([QtCore_LIBS])
-AC_SUBST([QtXml_CFLAGS])
-AC_SUBST([QtXml_LIBS])
-AC_SUBST([QtDBus_CFLAGS])
-AC_SUBST([QtDBus_LIBS])
-
-
-PKG_CHECK_MODULES([QtTest], [QtTest])
-
-AC_CHECK_LIB([cdb], [cdb_make_start], [],
-    [AC_MSG_ERROR([Can't find cdb library])])
-
-DEFAULT_CONTEXT_PROVIDERS="$datadir/contextkit/providers/"
-AC_SUBST(DEFAULT_CONTEXT_PROVIDERS)
-
-CXXFLAGS="-Wall -Werror \$(CONTEXT_LOG_CXXFLAGS)"
-
-#AC_CONFIG_HEADER([config.h])
-
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 cli/Makefile
-                 update-contextkit-providers/Makefile
-                 unit-tests/Makefile
-                 doc/Makefile
-                 man/Makefile
-                 contextsubscriber-1.0.pc
-                 unit-tests/util/Makefile
-                 unit-tests/cdbreader/Makefile
-                 unit-tests/cdbwriter/Makefile
-                 unit-tests/contextregistryinfo-xml-static/Makefile
-                 unit-tests/contextpropertyinfo-xml-static/Makefile
-                 unit-tests/contextregistryinfo-xml-dynamic/Makefile
-                 unit-tests/contextpropertyinfo-xml-dynamic/Makefile
-                 unit-tests/contextregistryinfo-cdb-static/Makefile
-                 unit-tests/contextpropertyinfo-cdb-static/Makefile
-                 unit-tests/contextregistryinfo-cdb-dynamic/Makefile
-                 unit-tests/contextpropertyinfo-cdb-dynamic/Makefile
-                 unit-tests/propertyprovider/Makefile
-                 unit-tests/propertyhandle/Makefile
-                 unit-tests/handlesignalrouter/Makefile
- 		 customer-tests/Makefile
-		 customer-tests/update-contextkit-providers/Makefile])
-
-AC_OUTPUT
diff --git a/libcontextsubscriber/unit-tests/Makefile.am b/libcontextsubscriber/unit-tests/Makefile.am
index 32e377ed..697e6ebb 100644
--- a/libcontextsubscriber/unit-tests/Makefile.am
+++ b/libcontextsubscriber/unit-tests/Makefile.am
@@ -1,11 +1,10 @@
-SUBDIRSTESTS = propertyprovider propertyhandle handlesignalrouter	\
-	cdbreader cdbwriter contextregistryinfo-xml-static		\
+SUBDIRSTESTS = provider propertyhandle handlesignalrouter cdbreader	\
+	cdbwriter contextregistryinfo-xml-static			\
 	contextpropertyinfo-xml-static contextregistryinfo-cdb-static	\
 	contextpropertyinfo-cdb-static contextregistryinfo-cdb-dynamic	\
 	contextpropertyinfo-cdb-dynamic					\
 	contextregistryinfo-xml-dynamic					\
-	contextpropertyinfo-xml-dynamic					\
-	infoxmlkeysfinder
+	contextpropertyinfo-xml-dynamic infoxmlkeysfinder
 SUBDIRS = $(SUBDIRSTESTS) util
 
 check-sum: all
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/Makefile.am b/libcontextsubscriber/unit-tests/propertyprovider/Makefile.am
deleted file mode 100644
index 0bd46dde..00000000
--- a/libcontextsubscriber/unit-tests/propertyprovider/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-check_PROGRAMS = propertyprovider-unit-tests
-
-# your test's sources
-propertyprovider_unit_tests_SOURCES = testpropertyprovider.cpp		\
-	testpropertyprovider.h managerinterface.h dbusnamelistener.h	\
-	subscriberinterface.h handlesignalrouter.h queuedinvoker.h
-
-# only include these files in the coverage
-COVERAGE_FILES = propertyprovider.cpp
-
-# do the testing, coverage, etc. stuff
-# tests.am is using +=, so we have to set a value here for these four always
-AM_CXXFLAGS = $(QtDBus_CFLAGS)
-AM_LDFLAGS = $(QtDBus_LIBS)
-FROM_SOURCE = propertyprovider.cpp propertyprovider.h loggingfeatures.h # copy these files from the real source
-FROM_SOURCE_DIR = $(srcdir)/../../src
-LDADD =
-include $(top_srcdir)/am/tests.am
-
-nodist_propertyprovider_unit_tests_SOURCES = mocs.cpp
-QT_TOMOC = $(filter %.h, $(propertyprovider_unit_tests_SOURCES) $(FROM_SOURCE))
-include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/.gitignore b/libcontextsubscriber/unit-tests/provider/.gitignore
index 6d6d109c..daafc452 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/.gitignore
+++ b/libcontextsubscriber/unit-tests/provider/.gitignore
@@ -1,5 +1,5 @@
-propertyprovider.cpp
-propertyprovider.h
+provider.cpp
+provider.h
 sconnect.h
 logging.cpp
 logging.h
diff --git a/libcontextsubscriber/unit-tests/provider/Makefile.am b/libcontextsubscriber/unit-tests/provider/Makefile.am
new file mode 100644
index 00000000..9a377971
--- /dev/null
+++ b/libcontextsubscriber/unit-tests/provider/Makefile.am
@@ -0,0 +1,22 @@
+check_PROGRAMS = provider-unit-tests
+
+# your test's sources
+provider_unit_tests_SOURCES = testprovider.cpp			\
+	testprovider.h managerinterface.h dbusnamelistener.h	\
+	subscriberinterface.h handlesignalrouter.h queuedinvoker.h
+
+# only include these files in the coverage
+COVERAGE_FILES = provider.cpp
+
+# do the testing, coverage, etc. stuff
+# tests.am is using +=, so we have to set a value here for these four always
+AM_CXXFLAGS = $(QtDBus_CFLAGS)
+AM_LDFLAGS = $(QtDBus_LIBS)
+FROM_SOURCE = provider.cpp provider.h loggingfeatures.h # copy these files from the real source
+FROM_SOURCE_DIR = $(srcdir)/../../src
+LDADD =
+include $(top_srcdir)/am/tests.am
+
+nodist_provider_unit_tests_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(provider_unit_tests_SOURCES) $(FROM_SOURCE))
+include $(top_srcdir)/am/qt.am
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/dbusnamelistener.h b/libcontextsubscriber/unit-tests/provider/dbusnamelistener.h
index f27035d2..f27035d2 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/dbusnamelistener.h
+++ b/libcontextsubscriber/unit-tests/provider/dbusnamelistener.h
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/handlesignalrouter.h b/libcontextsubscriber/unit-tests/provider/handlesignalrouter.h
index d0c71841..d0c71841 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/handlesignalrouter.h
+++ b/libcontextsubscriber/unit-tests/provider/handlesignalrouter.h
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/managerinterface.h b/libcontextsubscriber/unit-tests/provider/managerinterface.h
index 5a6a9ecf..5a6a9ecf 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/managerinterface.h
+++ b/libcontextsubscriber/unit-tests/provider/managerinterface.h
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/queuedinvoker.h b/libcontextsubscriber/unit-tests/provider/queuedinvoker.h
index dc238956..dc238956 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/queuedinvoker.h
+++ b/libcontextsubscriber/unit-tests/provider/queuedinvoker.h
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/subscriberinterface.h b/libcontextsubscriber/unit-tests/provider/subscriberinterface.h
index e30c7964..e30c7964 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/subscriberinterface.h
+++ b/libcontextsubscriber/unit-tests/provider/subscriberinterface.h
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/testpropertyprovider.cpp b/libcontextsubscriber/unit-tests/provider/testprovider.cpp
index 86bafb20..19f16ae1 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/testpropertyprovider.cpp
+++ b/libcontextsubscriber/unit-tests/provider/testprovider.cpp
@@ -20,7 +20,7 @@
  */
 
 // Header file of the tests
-#include "testpropertyprovider.h"
+#include "testprovider.h"
 
 // Mock header files
 #include "dbusnamelistener.h"
@@ -29,7 +29,7 @@
 #include "managerinterface.h"
 
 // Header file of the class to be tested
-#include "propertyprovider.h"
+#include "provider.h"
 
 #include <QtTest/QtTest>
 #include <QDebug>
diff --git a/libcontextsubscriber/unit-tests/propertyprovider/testpropertyprovider.h b/libcontextsubscriber/unit-tests/provider/testprovider.h
index b2345f5e..b2345f5e 100644
--- a/libcontextsubscriber/unit-tests/propertyprovider/testpropertyprovider.h
+++ b/libcontextsubscriber/unit-tests/provider/testprovider.h