Modified the config and library path in PPM Service for Tizen Platform

Change-Id: I481c4eaaac1aa184f4a2a3b7f9254ddac7702598
Signed-off-by: krishna.kb <krishna.kb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/protocol-plugin/plugin-manager/src/Config.cpp b/service/protocol-plugin/plugin-manager/src/Config.cpp
index 48898ef..4b07ac7 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/Config.cpp
+++ b/service/protocol-plugin/plugin-manager/src/Config.cpp
@@ -34,7 +34,16 @@ Config *Config::s_configinstance = NULL;
 
 Config::Config()
 {
+/**
+ * For Tizen Platform, specifiy the absolute location of config file. It is required for
+ * Tizen 2.3 EFL App to work.
+ */
+#ifdef __TIZEN__
+    if (loadConfigFile("/opt/usr/apps/org.iotivity.service.ppm.ppmsampleapp/lib/pluginmanager.xml")
+                                                                                        != PM_S_OK)
+#else
     if (loadConfigFile("./pluginmanager.xml") != PM_S_OK)
+#endif //#ifdef __TIZEN__
     {
         fprintf(stderr, "PM Configuration file is not exist current Folder.\n" );
         exit(EXIT_FAILURE);

diff --git a/service/protocol-plugin/plugin-manager/src/PluginManager.cpp b/service/protocol-plugin/plugin-manager/src/PluginManager.cpp
index acdaeb9..43b41a8 100644 (file)
--- a/service/protocol-plugin/plugin-manager/src/PluginManager.cpp
+++ b/service/protocol-plugin/plugin-manager/src/PluginManager.cpp
@@ -29,7 +29,17 @@ using namespace OIC;
 
 PluginManager::PluginManager()
 {
+/**
+ * For Tizen Platform, specifiy the absolute location of dynamic library. It is required for
+ * Tizen 2.3 EFL App to work.
+ */
+#ifdef __TIZEN__
+    handle = dlopen("/opt/usr/apps/org.iotivity.service.ppm.ppmsampleapp/lib/libpmimpl.so",
+                                                                                        RTLD_LAZY);
+#else
     handle = dlopen("./libpmimpl.so", RTLD_LAZY);
+#endif //#ifdef __TIZEN__
+
     if (!handle)
     {
         fprintf(stderr, "%s\n", dlerror());

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index 31abb2b..738f9a4 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -61,6 +61,8 @@ mkdir -p %{buildroot}%{_sbindir}
 
 cp out/tizen/*/release/lib*.so %{buildroot}%{_libdir}
 cp out/tizen/*/release/lib*.a %{buildroot}%{_libdir}
+cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-fan/*.so %{buildroot}%{_libdir}
+cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-light/*.so %{buildroot}%{_libdir}
 
 cp resource/csdk/stack/include/ocstack.h %{buildroot}%{_includedir}
 cp resource/include/*.h %{buildroot}%{_includedir}
@@ -80,6 +82,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
+%{_libdir}/fanserver*.so
+%{_libdir}/lightserver*.so
 
 %files devel
 %defattr(-,root,root,-)