From: Younho Park <younho.park@samsung.com>
Date: Mon, 7 Mar 2016 14:00:40 +0000 (+0900)
Subject: Enabled On-demand mode
X-Git-Tag: accepted/tizen/common/20160308.142537^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=252197af8551f8ea1a056c4d8d5b661efe0d55b3;p=platform%2Fcore%2Fconvergence%2Fservice-adaptor.git

Enabled On-demand mode

Change-Id: I028e8cdde1f81ec8a397aa382e8097db5b853655
Signed-off-by: Younho Park <younho.park@samsung.com>
---

diff --git a/packaging/service-adaptor.service b/packaging/service-adaptor.service
index 5b83503..e28cd96 100644
--- a/packaging/service-adaptor.service
+++ b/packaging/service-adaptor.service
@@ -4,11 +4,11 @@ After=dbus.socket dbus.service
 Requires=dbus.socket
 
 [Service]
-Type=simple
+Type=dbus
 BusName=org.tizen.serviceadaptor.client
 ExecStart=/usr/bin/service-adaptor-server
-Restart=on-failure
-RestartSec=0
+#Restart=on-failure
+#RestartSec=0
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index a00886c..d97fc3c 100644
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -1,6 +1,6 @@
 Name:       service-adaptor
 Summary:    Service Adaptor Framework for Convergence
-Version:    1.1.4
+Version:    1.1.5
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -21,11 +21,6 @@ BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-appfw-package-manager)
 BuildRequires:  pkgconfig(capi-appfw-service-application)
 BuildRequires:  pkgconfig(json-glib-1.0)
-#BuildRequires:  pkgconfig(security-server)
-#BuildRequires:  pkgconfig(service-discovery)
-#BuildRequires:  pkgconfig(service-federation)
-#BuildRequires:  service-discovery-devel
-#BuildRequires:  service-federation-devel
 
 %description
 Service Adaptor Framework Library/Binary package
@@ -42,9 +37,7 @@ This package contains the header and pc files of Service Adaptor.
 %setup -q
 
 %build
-#export CFLAGS="${CFLAGS} -fPIC -Wall -g -fvisibility=hidden -fdata-sections -ffunction-sections"
 export CFLAGS="${CFLAGS} -fPIC -Wall -g -fdata-sections -ffunction-sections"
-#export CXXFLAGS="${CXXFLAGS} -fPIC -Wall -g -fvisibility=hidden"
 export CXXFLAGS="${CXXFLAGS} -fPIC -Wall -g"
 export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 
@@ -72,13 +65,13 @@ mkdir -p %{buildroot}%{_libdir}/service-provider/message
 mkdir -p %{buildroot}%{_libdir}/service-provider/push
 mkdir -p %{buildroot}%{_libdir}/service-provider/shop
 
-mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/service-adaptor.service
-ln -s ../service-adaptor.service %{buildroot}%{_unitdir_user}/default.target.wants/service-adaptor.service
-
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
 install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.serviceadaptor.client.service
 
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/service-adaptor.service
+%install_service multi-user.target.wants service-adaptor.service
+
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor
 cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor-devel
@@ -95,9 +88,8 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-adaptor-devel
 %{_libdir}/service-provider
 %{_libdir}/service-provider/*
 %{_bindir}/service-adaptor-server
-#%{_bindir}/sal-test
-%{_unitdir_user}/service-adaptor.service
-%{_unitdir_user}/default.target.wants/service-adaptor.service
+%{_unitdir}/service-adaptor.service
+%{_unitdir}/multi-user.target.wants/service-adaptor.service
 %{_datadir}/dbus-1/system-services/org.tizen.serviceadaptor.client.service
 %{_sysconfdir}/dbus-1/system.d/org.tizen.serviceadaptor.client.conf
 /usr/share/license/%{name}
diff --git a/server/src/service-adaptor.c b/server/src/service-adaptor.c
index 40c3b0b..7d6c119 100644
--- a/server/src/service-adaptor.c
+++ b/server/src/service-adaptor.c
@@ -1016,9 +1016,8 @@ FUNC_START();
 	}
 
 	service_adaptor_debug("Service Adaptor: started");
-/*	TODO it will be activated for on-demand
+/*	TODO it will be activated for on-demand */
 	ping_manager_init(5, g_default_loop);
-*/
 
 	/* 3) assign to global service adaptor handle */
 	g_service_adaptor = service_adaptor;