14 files changed, 104 insertions, 22 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f85839d..c4f857b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -2,20 +2,6 @@ project(akonadi2_client)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-set(akonadi2client_SRCS
-    resourceaccess.cpp
-    threadboundary.cpp
-)
-
-add_library(${PROJECT_NAME} SHARED ${akonadi2client_SRCS})
+add_executable(${PROJECT_NAME} main.cpp)
 target_link_libraries(${PROJECT_NAME} akonadi2common)
-qt5_use_modules(${PROJECT_NAME} Widgets Network)
-install(TARGETS ${PROJECT_NAME} DESTINATION lib)
-
-add_executable(${PROJECT_NAME}_bin main.cpp)
-set_target_properties(${PROJECT_NAME}_bin PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME}_bin ${PROJECT_NAME} akonadi2common)
-qt5_use_modules(${PROJECT_NAME}_bin Widgets Network)
-install(TARGETS ${PROJECT_NAME}_bin DESTINATION bin)
-
-add_subdirectory(test)
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/client/main.cpp b/client/main.cpp
index 77c93d2..c219f47 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -21,7 +21,7 @@
 #include <QCommandLineParser>
 
 #include "common/console.h"
-#include "resourceaccess.h"
+#include "common/resourceaccess.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d200635..fab7708 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -13,12 +13,16 @@ endif (STORAGE_unqlite)
 set(command_SRCS
     commands.cpp
     console.cpp
+    resourceaccess.cpp
     storage_common.cpp
+    threadboundary.cpp
     ${storage_SRCS})
 
 add_library(${PROJECT_NAME} SHARED ${command_SRCS})
 generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME akonadi2common_export.h)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-qt5_use_modules(${PROJECT_NAME} Widgets)
+qt5_use_modules(${PROJECT_NAME} Widgets Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS})
 install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+
+add_subdirectory(test)
diff --git a/common/clientapi.cpp b/common/clientapi.cpp
new file mode 100644
index 0000000..88797cc
--- /dev/null
+++ b/common/clientapi.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Aaron Seigo <aseigo@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "clientapi.h"
+
+Resource::Resource()
+    : d(0)
+{
+
+}
+
+Resource::~Resource()
+{
+    //delete d;
+}
+
+ResourceFactory::ResourceFactory(QObject *parent)
+    : QObject(parent),
+      d(0)
+{
+
+}
+
+ResourceFactory::~ResourceFactory()
+{
+    //delete d;
+}
+
diff --git a/client/clientapi.h b/common/clientapi.h
index f74e76a..3531462 100644
--- a/client/clientapi.h
+++ b/common/clientapi.h
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2014 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) version 3, or any
+ * later version accepted by the membership of KDE e.V. (or its
+ * successor approved by the membership of KDE e.V.), which shall
+ * act as a proxy defined in Section 6 of version 3 of the license.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <QString>
@@ -415,5 +435,31 @@ public:
     }
 };
 
+class Resource
+{
+public:
+    Resource();
+    virtual ~Resource();
+
+private:
+    class Private;
+    Private * const d;
+};
+
+class ResourceFactory : public QObject
+{
+public:
+    ResourceFactory(QObject *parent);
+    virtual ~ResourceFactory();
+
+    virtual Resource *createResource() = 0;
+    virtual void registerFacade(FacadeFactory &factory) = 0;
+
+private:
+    class Private;
+    Private * const d;
+};
 }
 
+Q_DECLARE_INTERFACE(Akonadi2::ResourceFactory, "org.kde.akonadi2.resourcefactory")
+
diff --git a/client/resourceaccess.cpp b/common/resourceaccess.cpp
index 2b58545..2b58545 100644
--- a/client/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
diff --git a/client/resourceaccess.h b/common/resourceaccess.h
index f381af1..f381af1 100644
--- a/client/resourceaccess.h
+++ b/common/resourceaccess.h
diff --git a/client/test/CMakeLists.txt b/common/test/CMakeLists.txt
index 601899a..98d4ecc 100644
--- a/client/test/CMakeLists.txt
+++ b/common/test/CMakeLists.txt
@@ -5,7 +5,7 @@ macro(auto_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
         qt5_use_modules(${_testname} Core Test)
-        target_link_libraries(${_testname} lmdb akonadi2_client)
+        target_link_libraries(${_testname} akonadi2common)
         add_test(NAME ${_testname} COMMAND ${_testname})
     endforeach(_testname)
 endmacro(auto_tests)
diff --git a/client/test/clientapitest.cpp b/common/test/clientapitest.cpp
index 2d1c238..2d1c238 100644
--- a/client/test/clientapitest.cpp
+++ b/common/test/clientapitest.cpp
diff --git a/client/threadboundary.cpp b/common/threadboundary.cpp
index 47ec508..47ec508 100644
--- a/client/threadboundary.cpp
+++ b/common/threadboundary.cpp
diff --git a/client/threadboundary.h b/common/threadboundary.h
index 9881afa..9881afa 100644
--- a/client/threadboundary.h
+++ b/common/threadboundary.h
diff --git a/dummyresource/CMakeLists.txt b/dummyresource/CMakeLists.txt
index e4a7ce2..e03fd4c 100644
--- a/dummyresource/CMakeLists.txt
+++ b/dummyresource/CMakeLists.txt
@@ -6,7 +6,7 @@ generate_flatbuffers(dummycalendar)
 
 #Client plugin
 add_library(${PROJECT_NAME} SHARED facade.cpp)
-target_link_libraries(${PROJECT_NAME} akonadi2common akonadi2_client)
+target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Core)
 #install(TARGETS ${PROJECT_NAME} DESTINATION lib)
 
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 45e891c..0d47010 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -21,7 +21,8 @@
 
 #include <QDebug>
 #include <functional>
-#include "client/resourceaccess.h"
+
+#include "common/resourceaccess.h"
 #include "dummycalendar_generated.h"
 
 using namespace DummyCalendar;
diff --git a/dummyresource/facade.h b/dummyresource/facade.h
index 11b1de0..f179c06 100644
--- a/dummyresource/facade.h
+++ b/dummyresource/facade.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "client/clientapi.h"
+#include "common/clientapi.h"
 #include "common/storage.h"
 
 class ResourceAccess;