[D2D] Set on-boot to false

This sets on-boot to false.
The d2d server will be optionally launched later.

Change-Id: Iab66894fd1e59ad21b1f81a6a9bb616319052ec5
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/d2d_app/config.xml b/d2d_app/config.xml
index e16d7b64419495778738dac74e8cf75edcc3de27..f84c871549179d7c4347ad1b4cb3667730ff9a7e 100755 (executable)
--- a/d2d_app/config.xml
+++ b/d2d_app/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://yourdomain/GlobalDeviceWebServer" version="1.0.0" viewmodes="maximized">
-    <tizen:application package="9z6IujVul3" required_version="2.3"/>
+    <tizen:application package="9z6IujVul3" required_version="6.0"/>
     <feature name="http://tizen.org/feature/screen.size.all"/>
     <icon src="icon.png"/>
     <name>GlobalDeviceWebServer</name>
@@ -8,7 +8,7 @@
     <tizen:privilege name="http://tizen.org/privilege/application.info"/>
     <tizen:privilege name="http://tizen.org/privilege/package.info"/>
     <tizen:profile name="mobile"/>
-    <tizen:service id="9z6IujVul3.Service" type="global" on-boot="true" auto-restart="true">
+    <tizen:service id="9z6IujVul3.Service" type="global">
         <tizen:content src="service/service.js"/>
         <tizen:name>D2DGlobalService</tizen:name>
         <tizen:description>D2DGlobalService</tizen:description>

diff --git a/packaging/9z6IujVul3.xml.in b/packaging/9z6IujVul3.xml.in
deleted file mode 100644 (file)
index 107fdc2..0000000
--- a/packaging/9z6IujVul3.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_ID@" type="wgt" version="@WRTJS_VERSION@" api-version="@TIZEN_VERSION@" nodisplay-setting="false" readonly="true" preload="true">
-  <label>D2DGlobalService</label>
-  <author/>
-  <ui-application appid="@PACKAGE_ID@.Service" exec="/usr/apps/@PACKAGE_ID@/bin/@PACKAGE_ID@.Service" type="capp" taskmanage="false" nodisplay="true" multiple="false">
-    <label>D2DGlobalService</label>
-  </ui-application>
-  <privileges>
-    <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-  </privileges>
-</manifest>

diff --git a/packaging/d2d_app.xml.in b/packaging/d2d_app.xml.in
new file mode 100644 (file)
index 0000000..107fdc2
--- /dev/null
+++ b/packaging/d2d_app.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_ID@" type="wgt" version="@WRTJS_VERSION@" api-version="@TIZEN_VERSION@" nodisplay-setting="false" readonly="true" preload="true">
+  <label>D2DGlobalService</label>
+  <author/>
+  <ui-application appid="@PACKAGE_ID@.Service" exec="/usr/apps/@PACKAGE_ID@/bin/@PACKAGE_ID@.Service" type="capp" taskmanage="false" nodisplay="true" multiple="false">
+    <label>D2DGlobalService</label>
+  </ui-application>
+  <privileges>
+    <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+  </privileges>
+</manifest>

diff --git a/packaging/wrtjs.spec b/packaging/wrtjs.spec
index f86a92de2aafdf7a974c789e941b83c704e98f3e..2d0621b19964f5ee0770377be5abb72d4fee9ed1 100755 (executable)
--- a/packaging/wrtjs.spec
+++ b/packaging/wrtjs.spec
@@ -105,7 +105,7 @@ absolute_appdir=$PWD/%{app_dir}
   sed -e 's#@TIZEN_VERSION@#%{tizen_version_major}.%{tizen_version_minor}#g' \
       -e 's#@WRTJS_VERSION@#%{version}#g' \
       -e 's#@PACKAGE_ID@#%{_d2d_pkgid}#g' \
-      packaging/%{_d2d_pkgid}.xml.in \
+      packaging/d2d_app.xml.in \
       > packaging/%{_d2d_pkgid}.xml
 %endif