Moved LogService files from org.commontk.log to PluginFramework.

This allows plugins to try to get the log service without having
a dependency to org.commontk.log

Libs/PluginFramework/CMakeLists.txt

@@ -93,6 +93,9 @@ SET(KIT_SRCS
   service/cm/ctkConfigurationPlugin.cpp
   service/cm/ctkManagedService.h
   service/cm/ctkManagedServiceFactory.h
+
+  service/log/ctkLogService.cpp
+  service/log/ctkLogStream.cpp
   )
 
 # Headers that should run through moc

Plugins/org.commontk.log/ctkLogService.h

@@ -48,7 +48,7 @@
  *
  * @ThreadSafe
  */
-class org_commontk_log_EXPORT ctkLogService
+class CTK_PLUGINFW_EXPORT ctkLogService
 {
 
 public:
@@ -150,6 +150,6 @@ public:
 };
 
 
-Q_DECLARE_INTERFACE(ctkLogService, "org.commontk.log.ctkLogService")
+Q_DECLARE_INTERFACE(ctkLogService, "org.commontk.service.log.LogService")
 
 #endif // CTKLOGSERVICE_H

Plugins/org.commontk.log/ctkLogStream.h

@@ -23,14 +23,14 @@
 #ifndef CTKLOGSTREAM_H
 #define CTKLOGSTREAM_H
 
-#include <org_commontk_log_Export.h>
+#include <ctkPluginFrameworkExport.h>
 
 #include <ctkServiceReference.h>
 #include <QTextStream>
 
 class ctkLogService;
 
-class org_commontk_log_EXPORT ctkLogStream
+class CTK_PLUGINFW_EXPORT ctkLogStream
 {
 public:
 
@@ -68,7 +68,7 @@ protected:
   const int line;
 };
 
-class org_commontk_log_EXPORT ctkLogStreamWithServiceRef : public ctkLogStream
+class CTK_PLUGINFW_EXPORT ctkLogStreamWithServiceRef : public ctkLogStream
 {
 public:
 
@@ -84,7 +84,7 @@ protected:
   ctkServiceReference sr;
 };
 
-class org_commontk_log_EXPORT ctkNullLogStream : public ctkLogStream
+class CTK_PLUGINFW_EXPORT ctkNullLogStream : public ctkLogStream
 {
 public:
 

Plugins/org.commontk.configadmin/ctkCMEventDispatcher.cpp

@@ -22,7 +22,7 @@
 
 #include "ctkCMEventDispatcher_p.h"
 
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 #include <service/cm/ctkConfigurationListener.h>
 
 #include <QRunnable>

Plugins/org.commontk.configadmin/ctkCMLogTracker_p.h

@@ -24,7 +24,7 @@
 #define CTKCMLOGTRACKER_P_H
 
 #include <ctkServiceTracker.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 /**
  * This class encapsulates the ctkLogService

Plugins/org.commontk.configadmin/ctkConfigurationAdminFactory.cpp

@@ -22,7 +22,7 @@
 
 #include "ctkConfigurationAdminFactory_p.h"
 
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 #include "ctkConfigurationAdminImpl_p.h"
 #include "ctkConfigurationImpl_p.h"

Plugins/org.commontk.configadmin/ctkConfigurationStore.cpp

@@ -24,7 +24,7 @@
 #include "ctkConfigurationAdminFactory_p.h"
 
 #include <ctkPluginContext.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 #include <QDateTime>
 

Plugins/org.commontk.configadmin/ctkManagedServiceFactoryTracker.cpp

@@ -23,7 +23,7 @@
 #include "ctkManagedServiceFactoryTracker_p.h"
 
 #include <service/cm/ctkConfigurationException.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 #include "ctkConfigurationAdminActivator_p.h"
 #include "ctkConfigurationAdminFactory_p.h"

Plugins/org.commontk.configadmin/ctkManagedServiceTracker.cpp

@@ -23,7 +23,7 @@
 #include "ctkManagedServiceTracker_p.h"
 
 #include <service/cm/ctkConfigurationException.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 #include "ctkConfigurationImpl_p.h"
 #include "ctkConfigurationAdminFactory_p.h"

Plugins/org.commontk.configadmin/manifest_headers.cmake

@@ -1,2 +1 @@
 SET(Plugin-ActivationPolicy "eager")
-SET(Require-Plugin org.commontk.log)

Plugins/org.commontk.configadmin/target_libraries.cmake

@@ -0,0 +1,9 @@
+# See CMake/ctkMacroGetTargetLibraries.cmake
+#
+# This file should list the libraries required to build the current CTK plugin.
+# For specifying required plugins, see the manifest_headers.cmake file.
+#
+
+SET(target_libraries
+  CTKPluginFramework
+)

Plugins/org.commontk.log/CMakeLists.txt

@@ -5,8 +5,6 @@ SET(PLUGIN_export_directive "org_commontk_log_EXPORT")
 SET(PLUGIN_SRCS
   ctkLogPlugin.cpp
   ctkLogQDebug.cpp
-  ctkLogService.cpp
-  ctkLogStream.cpp
 )
 
 # Files which should be processed by Qts moc

Plugins/org.commontk.log/ctkLogQDebug_p.h

@@ -23,7 +23,7 @@
 #ifndef CTKLOGQDEBUG_P_H
 #define CTKLOGQDEBUG_P_H
 
-#include "ctkLogService.h"
+#include <service/log/ctkLogService.h>
 
 #include <QObject>
 

Plugins/org.commontk.log4qt/manifest_headers.cmake

@@ -1,2 +1 @@
 SET(Plugin-Name "Log4Qt Service")
-SET(Require-Plugin org.commontk.log)

Plugins/org.commontk.log4qt/target_libraries.cmake

@@ -5,5 +5,6 @@
 #
 
 SET(target_libraries
+  CTKPluginFramework
   Log4Qt
 )

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceActivator.cpp

@@ -11,7 +11,7 @@
 
 #include <ctkServiceTracker.h>
 #include <ctkServiceException.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 
 #include <QtPlugin>
 

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceFactory.cpp

@@ -25,7 +25,8 @@
 #include "ctkQtMobilityServiceRuntime_p.h"
 #include "ctkQtMobilityServiceActivator_p.h"
 
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
+
 #include <ctkPluginException.h>
 #include <ctkPluginConstants.h>
 

Plugins/org.commontk.qtmobility.service/ctkQtMobilityServiceRuntime.cpp

@@ -28,7 +28,7 @@
 
 #include <ctkPluginContext.h>
 #include <ctkPlugin.h>
-#include <ctkLogService.h>
+#include <service/log/ctkLogService.h>
 #include <ctkPluginConstants.h>
 #include <ctkServiceRegistration.h>
 

Plugins/org.commontk.qtmobility.service/manifest_headers.cmake

@@ -1,2 +1 @@
 SET(Plugin-ActivationPolicy "eager")
-SET(Require-Plugin org.commontk.log)