cleanups

moved libcontextsubscriber/sandbox to /sandbox
moved libcontextsubscriber/multithreading-tests to /sandbox
removed old Vala references from HACKING
removed old gtk-doc thingies from here and there

Signed-off-by: Marja Hassinen <ext-marja.2.hassinen@nokia.com>

45 files changed, 13 insertions, 284 deletions

diff --git a/HACKING b/HACKING
index f2cae842..87ecc542 100644
--- a/HACKING
+++ b/HACKING
@@ -177,13 +177,17 @@ Here is the general procedure:
 
   $ make maintainer-clean || make distclean
 
+  If you don't have any new files not commited yet, you can also use:
+
+  $ git clean -dfx
+
 - Recreate the build cruft.
 
   $ ./autogen.sh
 
 - Configure your source tree as needed for making a release.
 
-  $ ./configure --enable-maintainer-mode --enable-gtk-doc
+  $ ./configure --enable-doc
 
 - Build the source tree and do a "make distcheck"
 
@@ -200,13 +204,12 @@ the contents of the created directory.
 Building a debian package
 -------------------------
 
-After a git clone, you first have to build vala C sources and
-documentation.  If you have extracted a distribution tarball, then you
-already have these files.  Otherwise just do a ./configure, let's
-double check that all of the documentation tools and the vala compiler
-is found and make.  After that you are ready to run
-'dpkg-buildpackage -us -uc -rfakeroot -b' to get your shiny new debian
-packages.
+After a git clone, you first have to build documentation.  If you have
+extracted a distribution tarball, then you already have these files.
+Otherwise just do a ./configure, let's double check that all of the
+documentation tools and the vala compiler is found and make.  After
+that you are ready to run 'dpkg-buildpackage -us -uc -rfakeroot -b' to
+get your shiny new debian packages.
 
 Making releases
 ---------------
diff --git a/configure.ac b/configure.ac
index 4ee03162..af75c4c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,6 @@ AC_SUBST([CDB_LIBS])
 
 # tools for documentation
 AX_FEATURE_DISABLEABLE([doc], [BUILD_DOCS], [disable building of documentation])
-AC_MSG_CHECKING([for gtk-doc])
-PKG_CHECK_EXISTS([gtk-doc >= 1.9],[AC_MSG_RESULT([yes])],
-			  [AC_MSG_RESULT([no])
-			   missing_deps_BUILD_DOCS="$missing_deps_BUILD_DOCS, gtk-doc >= 1.9"])
-HTML_DIR="${datadir}/gtk-doc/html"
-AC_SUBST([HTML_DIR])
 AX_DISABLE_FEATURE_ON_PROG([Dot drawing tool], [BUILD_DOCS], [DOT], [dot])
 AX_DISABLE_FEATURE_ON_PROG([Asciidoc], [BUILD_DOCS], [ASCIIDOC], [asciidoc], [8.2.7])
 AX_DISABLE_FEATURE_ON_PROG([source-highlight], [BUILD_DOCS], [SOURCE_HIGHLIGHT], [source-highlight])
@@ -44,8 +38,6 @@ AX_DISABLE_FEATURE_ON_PROG([xsltproc], [BUILD_DOCS], [XSLTPROC], [xsltproc])
 AX_DISABLE_FEATURE_ON_PROG([xmllint], [BUILD_DOCS], [XMLLINT], [xmllint])
 AX_DISABLE_FEATURE_ON_PROG([doxygen], [BUILD_DOCS], [DOXYGEN], [doxygen])
 AM_CONDITIONAL([CONTEXTKIT_BUILD_DOCS], [test "$missing_deps_BUILD_DOCS" = ""])
-AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test "$missing_deps_BUILD_DOCS" = ""])
-AM_CONDITIONAL([ENABLE_GTK_DOC], [test "$missing_deps_BUILD_DOCS" = ""])
 
 # coverage tools
 AX_FEATURE_DISABLEABLE([coverage], [COVERAGE], [disable unittests' coverage support])
@@ -81,14 +73,6 @@ AC_CONFIG_FILES([
         libcontextsubscriber/unit-tests/provider/Makefile
         libcontextsubscriber/unit-tests/util/Makefile
         libcontextsubscriber/unit-tests/nanoxml/Makefile
-        libcontextsubscriber/multithreading-tests/Makefile
-        libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile
-        libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile
-        libcontextsubscriber/multithreading-tests/single-thread/Makefile
-        libcontextsubscriber/multithreading-tests/stress-test/Makefile
-        libcontextsubscriber/multithreading-tests/using-backend-from-thread/Makefile
-        libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile
-        libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile
         libcontextsubscriber/update-contextkit-providers/Makefile
 	libcontextprovider/contextprovider-1.0.pc
 	libcontextprovider/Makefile
diff --git a/doc/context-arch.txt b/doc/context-arch.txt
index 767dcf35..bc8f77dc 100644
--- a/doc/context-arch.txt
+++ b/doc/context-arch.txt
@@ -394,7 +394,7 @@ Packages
 
 .+contextkit+
 
-Languages:: C, C++, Vala
+Languages:: C, C++
 
 License:: LGPL 2.1
 
diff --git a/doc/demos.txt b/doc/demos.txt
deleted file mode 100644
index 0add33bc..00000000
--- a/doc/demos.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Demo / manual test descrption
-
-Feature to be demonstrated:
-- Dropping the context prefix both on provider side and on client side, when doing the dbus traffic.
-
-
-0.
-
-Versions used in this tests:
-
-Latest versions (27.5.2009) of DuiValueSpace and libcontextprovider:
-libcontextprovider0_0.1.8~unreleased_armel.deb
-libduivaluespace0_0.9~unreleased_armel.deb
-
-1a. Build the packages from ContextKit repository (branch removecontextprefix) inside scratchbox.
-Outside scratchbox:
-./autogen.sh --enable-gtk-doc
-./configure
-make
-make clean
-
-Inside scratchbox:
-./configure
-make
-dpkg-buildpackage -b -us -uc -rfakeroot
-
-1b. Build the packages from DuiValueSpace repository (branch dropping-context) inside scratchbox.
-
-Inside scratchbox:
-./configure
-make
-dpkg-buildpackage -b -us -uc -rfakeroot
-
-Note: When these versions are released, they can be obtained directly from Harmattan repository.
-
-
-3. Copy the .deb packages to the device and install them.
-
-On the device:
-4. Install context-subscriber-example.
-
-5. Start monitoring DBus traffic on system bus.
-dbus-monitor --system
-
-6. Run context-subscriber-example.
-
-7. Outcome: Even though the context-provider-example and context-subscriber-example use the keys with "Context." prefix, they still work together, and dbus-monitor shows that the keys are transmitted without the "Context." prefix.
-
-signal sender=:1.15 -> dest=(null destination) serial=38 path=/org/freedesktop/ContextKit/Subscribers/6; interface=org.freedesktop.ContextKit.Subscriber; member=Changed
-   array [
-      dict entry(
-         string "Example.EdgeUp"
-         variant             int32 3
-      )
-   ]
-   array [
-   ]
diff --git a/gtk-doc.make b/gtk-doc.make
deleted file mode 100644
index fa7fd6c4..00000000
--- a/gtk-doc.make
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-REPORT_FILES = \
-	$(DOC_MODULE)-undocumented.txt \
-	$(DOC_MODULE)-undeclared.txt \
-	$(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-$(REPORT_FILES): sgml-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-tmpl/*.sgml:
-	@true
-
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	mkhtml_options=""; \
-	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
-	fi
-	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	  else \
-	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	  fi; \
-	  $(mkinstalldirs) $${installdir} ; \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $${installdir}; \
-	  done; \
-	  if test -n "$(DOC_MODULE_VERSION)"; then \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-	  fi; \
-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-	fi
-
-uninstall-local:
-	if test -n "$(DOC_MODULE_VERSION)"; then \
-	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
-	else \
-	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-	fi; \
-	rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-#if ENABLE_GTK_DOC
-#dist-check-gtkdoc:
-#else
-#dist-check-gtkdoc:
-#	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-#	@false
-#endif
-
-# contextkit note: instead of checking the availability of gtk-doc,
-# just make the procedure, without hesitation.  gtk-doc + distcheck is
-# so hacky and messed up that we haven't found out a better way yet
-dist-check-gtkdoc: html-build.stamp
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/libcontextsubscriber/Makefile.am b/libcontextsubscriber/Makefile.am
index 35609d42..435fd078 100644
--- a/libcontextsubscriber/Makefile.am
+++ b/libcontextsubscriber/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src unit-tests customer-tests multithreading-tests cli cls update-contextkit-providers doc man
+SUBDIRS = src unit-tests customer-tests cli cls update-contextkit-providers doc man
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = contextsubscriber-1.0.pc
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/main.cpp b/sandbox/messaging-to-self/main.cpp
index aafda83c..aafda83c 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/main.cpp
+++ b/sandbox/messaging-to-self/main.cpp
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/messaging-to-self.pro b/sandbox/messaging-to-self/messaging-to-self.pro
index bafbb027..bafbb027 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/messaging-to-self.pro
+++ b/sandbox/messaging-to-self/messaging-to-self.pro
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/myobject.h b/sandbox/messaging-to-self/myobject.h
index 155ebf3b..155ebf3b 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/myobject.h
+++ b/sandbox/messaging-to-self/myobject.h
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/mythread.h b/sandbox/messaging-to-self/mythread.h
index 4170ccf8..4170ccf8 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/mythread.h
+++ b/sandbox/messaging-to-self/mythread.h
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/queuedinvoker.cpp b/sandbox/messaging-to-self/queuedinvoker.cpp
index 85dbb7d1..85dbb7d1 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/queuedinvoker.cpp
+++ b/sandbox/messaging-to-self/queuedinvoker.cpp
diff --git a/libcontextsubscriber/sandbox/messaging-to-self/queuedinvoker.h b/sandbox/messaging-to-self/queuedinvoker.h
index 8f81f26e..8f81f26e 100644
--- a/libcontextsubscriber/sandbox/messaging-to-self/queuedinvoker.h
+++ b/sandbox/messaging-to-self/queuedinvoker.h
diff --git a/libcontextsubscriber/multithreading-tests/Makefile.am b/sandbox/multithreading-tests/Makefile.am
index 8da6191d..8da6191d 100644
--- a/libcontextsubscriber/multithreading-tests/Makefile.am
+++ b/sandbox/multithreading-tests/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/.gitignore b/sandbox/multithreading-tests/new-property-in-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/new-property-in-thread/.gitignore
+++ b/sandbox/multithreading-tests/new-property-in-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile.am b/sandbox/multithreading-tests/new-property-in-thread/Makefile.am
index 59dc63a7..59dc63a7 100644
--- a/libcontextsubscriber/multithreading-tests/new-property-in-thread/Makefile.am
+++ b/sandbox/multithreading-tests/new-property-in-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/main.cpp b/sandbox/multithreading-tests/new-property-in-thread/main.cpp
index 3ab015fb..3ab015fb 100644
--- a/libcontextsubscriber/multithreading-tests/new-property-in-thread/main.cpp
+++ b/sandbox/multithreading-tests/new-property-in-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/new-property-in-thread/thread.h b/sandbox/multithreading-tests/new-property-in-thread/thread.h
index dd9951b3..dd9951b3 100644
--- a/libcontextsubscriber/multithreading-tests/new-property-in-thread/thread.h
+++ b/sandbox/multithreading-tests/new-property-in-thread/thread.h
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/.gitignore b/sandbox/multithreading-tests/old-property-in-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/old-property-in-thread/.gitignore
+++ b/sandbox/multithreading-tests/old-property-in-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile.am b/sandbox/multithreading-tests/old-property-in-thread/Makefile.am
index 59dc63a7..59dc63a7 100644
--- a/libcontextsubscriber/multithreading-tests/old-property-in-thread/Makefile.am
+++ b/sandbox/multithreading-tests/old-property-in-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/main.cpp b/sandbox/multithreading-tests/old-property-in-thread/main.cpp
index c21c9d7f..c21c9d7f 100644
--- a/libcontextsubscriber/multithreading-tests/old-property-in-thread/main.cpp
+++ b/sandbox/multithreading-tests/old-property-in-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/old-property-in-thread/thread.h b/sandbox/multithreading-tests/old-property-in-thread/thread.h
index ec84afdf..ec84afdf 100644
--- a/libcontextsubscriber/multithreading-tests/old-property-in-thread/thread.h
+++ b/sandbox/multithreading-tests/old-property-in-thread/thread.h
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/.gitignore b/sandbox/multithreading-tests/single-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/single-thread/.gitignore
+++ b/sandbox/multithreading-tests/single-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/Makefile.am b/sandbox/multithreading-tests/single-thread/Makefile.am
index 010bc826..010bc826 100644
--- a/libcontextsubscriber/multithreading-tests/single-thread/Makefile.am
+++ b/sandbox/multithreading-tests/single-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/listener.h b/sandbox/multithreading-tests/single-thread/listener.h
index 9980f62a..9980f62a 100644
--- a/libcontextsubscriber/multithreading-tests/single-thread/listener.h
+++ b/sandbox/multithreading-tests/single-thread/listener.h
diff --git a/libcontextsubscriber/multithreading-tests/single-thread/main.cpp b/sandbox/multithreading-tests/single-thread/main.cpp
index 16dd2f65..16dd2f65 100644
--- a/libcontextsubscriber/multithreading-tests/single-thread/main.cpp
+++ b/sandbox/multithreading-tests/single-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/.gitignore b/sandbox/multithreading-tests/stress-test/.gitignore
index e08dedad..e08dedad 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/.gitignore
+++ b/sandbox/multithreading-tests/stress-test/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/1provider.cdb b/sandbox/multithreading-tests/stress-test/1provider.cdb
index 58655ef3..58655ef3 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/1provider.cdb
+++ b/sandbox/multithreading-tests/stress-test/1provider.cdb
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/2providers.cdb b/sandbox/multithreading-tests/stress-test/2providers.cdb
index 98324d4c..98324d4c 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/2providers.cdb
+++ b/sandbox/multithreading-tests/stress-test/2providers.cdb
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/Makefile.am b/sandbox/multithreading-tests/stress-test/Makefile.am
index 59dc63a7..59dc63a7 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/Makefile.am
+++ b/sandbox/multithreading-tests/stress-test/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/main.cpp b/sandbox/multithreading-tests/stress-test/main.cpp
index d7c334bd..d7c334bd 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/main.cpp
+++ b/sandbox/multithreading-tests/stress-test/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/provider.py b/sandbox/multithreading-tests/stress-test/provider.py
index 748929a4..748929a4 100755
--- a/libcontextsubscriber/multithreading-tests/stress-test/provider.py
+++ b/sandbox/multithreading-tests/stress-test/provider.py
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/runme.sh b/sandbox/multithreading-tests/stress-test/runme.sh
index a2aa73d6..a2aa73d6 100755
--- a/libcontextsubscriber/multithreading-tests/stress-test/runme.sh
+++ b/sandbox/multithreading-tests/stress-test/runme.sh
diff --git a/libcontextsubscriber/multithreading-tests/stress-test/thread.h b/sandbox/multithreading-tests/stress-test/thread.h
index 44cbf7c8..44cbf7c8 100644
--- a/libcontextsubscriber/multithreading-tests/stress-test/thread.h
+++ b/sandbox/multithreading-tests/stress-test/thread.h
diff --git a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/.gitignore b/sandbox/multithreading-tests/using-backend-from-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/.gitignore
+++ b/sandbox/multithreading-tests/using-backend-from-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/Makefile.am b/sandbox/multithreading-tests/using-backend-from-thread/Makefile.am
index b4cf1a5d..b4cf1a5d 100644
--- a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/Makefile.am
+++ b/sandbox/multithreading-tests/using-backend-from-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/main.cpp b/sandbox/multithreading-tests/using-backend-from-thread/main.cpp
index a6a7c8aa..a6a7c8aa 100644
--- a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/main.cpp
+++ b/sandbox/multithreading-tests/using-backend-from-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/thread.h b/sandbox/multithreading-tests/using-backend-from-thread/thread.h
index cd77a298..cd77a298 100644
--- a/libcontextsubscriber/multithreading-tests/using-backend-from-thread/thread.h
+++ b/sandbox/multithreading-tests/using-backend-from-thread/thread.h
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore
+++ b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am
index 59dc63a7..59dc63a7 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am
+++ b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/main.cpp b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/main.cpp
index 1a1727b7..1a1727b7 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/main.cpp
+++ b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/thread.h b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/thread.h
index e92af6f2..e92af6f2 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-only-in-thread/thread.h
+++ b/sandbox/multithreading-tests/wait-for-subscription-only-in-thread/thread.h
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/.gitignore b/sandbox/multithreading-tests/wait-for-subscription-thread/.gitignore
index 4390dc85..4390dc85 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/.gitignore
+++ b/sandbox/multithreading-tests/wait-for-subscription-thread/.gitignore
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile.am b/sandbox/multithreading-tests/wait-for-subscription-thread/Makefile.am
index 59dc63a7..59dc63a7 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/Makefile.am
+++ b/sandbox/multithreading-tests/wait-for-subscription-thread/Makefile.am
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/main.cpp b/sandbox/multithreading-tests/wait-for-subscription-thread/main.cpp
index 44390e2d..44390e2d 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/main.cpp
+++ b/sandbox/multithreading-tests/wait-for-subscription-thread/main.cpp
diff --git a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/thread.h b/sandbox/multithreading-tests/wait-for-subscription-thread/thread.h
index 7766fe68..7766fe68 100644
--- a/libcontextsubscriber/multithreading-tests/wait-for-subscription-thread/thread.h
+++ b/sandbox/multithreading-tests/wait-for-subscription-thread/thread.h