shortcut: change "com.samsung" to "org.tizen"

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
Change-Id: Ia9a8e7950dd6bb59f79095ca5b57885ead68d0c9

diff --git a/TC/testcase/utc_shortcut.c b/TC/testcase/utc_shortcut.c
index a28745b..d5879ee 100755 (executable)
--- a/TC/testcase/utc_shortcut.c
+++ b/TC/testcase/utc_shortcut.c
@@ -20,9 +20,9 @@
 
 #include <shortcut.h>
 
-#define MUSIC_APP "com.samsung.music-player"
+#define MUSIC_APP "org.tizen.music-player"
 #define MUSIC_DYNAMICBOX MUSIC_APP ".dynamicbox"
-#define MUSIC_EASYBOX "com.samsung.music-player.easymode.dynamicbox"
+#define MUSIC_EASYBOX "org.tizen.music-player.easymode.dynamicbox"
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -259,7 +259,7 @@ static void utc_shortcut_icon_request_set_info_p(void)
 static void utc_shortcut_icon_request_send_n(void)
 {
        int ret;
-       
+
        ret = shortcut_icon_request_send(NULL, DYNAMICBOX_TYPE_1x1, NULL, NULL, NULL, NULL, NULL);
        dts_check_eq("shortcut_icon_request_send", ret, SHORTCUT_ERROR_INVALID_PARAMETER, "success");
 }

diff --git a/TC/tet_tmp_dir/23996aa/testcase/utc_dynamicbox_service.c b/TC/tet_tmp_dir/23996aa/testcase/utc_dynamicbox_service.c
index 73f999c..689954f 100755 (executable)
--- a/TC/tet_tmp_dir/23996aa/testcase/utc_dynamicbox_service.c
+++ b/TC/tet_tmp_dir/23996aa/testcase/utc_dynamicbox_service.c
@@ -21,9 +21,9 @@
 #include <dynamicbox-service.h>
 #include <dynamicbox-errno.h>
 
-#define MUSIC_APP "com.samsung.music-player"
+#define MUSIC_APP "org.tizen.music-player"
 #define MUSIC_DYNAMICBOX MUSIC_APP ".dynamicbox"
-#define MUSIC_EASYBOX "com.samsung.music-player.easymode.dynamicbox"
+#define MUSIC_EASYBOX "org.tizen.music-player.easymode.dynamicbox"
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -223,7 +223,7 @@ static void utc_dynamicbox_service_mainappid_p(void)
 {
        const char *appid;
        appid = dynamicbox_service_mainappid(MUSIC_DYNAMICBOX);
-       dts_check_str_eq("dynamicbox_service_mainappid", appid, MUSIC_APP, "\"com.samsung.music-player\" should be returned\n");
+       dts_check_str_eq("dynamicbox_service_mainappid", appid, MUSIC_APP, "\"org.tizen.music-player\" should be returned\n");
 }
 
 static void utc_dynamicbox_service_get_pkglist_by_pkgid_n(void)
@@ -265,7 +265,7 @@ static void utc_dynamicbox_service_is_primary_p(void)
 {
        int ret;
        ret = dynamicbox_service_is_primary(MUSIC_DYNAMICBOX);
-       dts_check_str_eq("dynamicbox_service_is_primary", ret, 1, "\"com.samsung.music-player\" is primary(1)\n");
+       dts_check_str_eq("dynamicbox_service_is_primary", ret, 1, "\"org.tizen.music-player\" is primary(1)\n");
 }
 
 static void utc_dynamicbox_service_provider_name_n(void)
@@ -309,7 +309,7 @@ static void utc_dynamicbox_service_appid_p(void)
 {
        char *appid;
        appid = dynamicbox_service_appid(MUSIC_DYNAMICBOX);
-       dts_check_str_eq("dynamicbox_service_appid", appid, MUSIC_APP, "appid is com.samsung.music-player");
+       dts_check_str_eq("dynamicbox_service_appid", appid, MUSIC_APP, "appid is org.tizen.music-player");
 }
 
 static void utc_dynamicbox_service_i18n_name_n(void)

diff --git a/doc_prod/shortcut_doc.h b/doc_prod/shortcut_doc.h
index 5f360c6..9343f16 100755 (executable)
--- a/doc_prod/shortcut_doc.h
+++ b/doc_prod/shortcut_doc.h
@@ -23,7 +23,7 @@
  * @brief To enhance the Add to home feature. Two types of API sets are supported.
  *   - One for the homescreen developers.
  *   - The other for the application developers who should implement the Add to home feature.
- * @ingroup CAPI_APPLICATION_FRAMEWORK 
+ * @ingroup CAPI_APPLICATION_FRAMEWORK
  * @section SHORTCUT_MODULE_HEADER Required Header
  *   \#include <shortcut.h>
  * @section SHORTCUT_MODULE_OVERVIEW Overview
@@ -35,8 +35,8 @@ If home screen implements the shortcut service using the library, the applicatio
 <H1>2. How to add a new shortcut to the home screen</H1>
 <H2>2.1 Add to home (From the app to home)</H2>
 
-The following are two separate APIs to support the "add to home" feature. 
- 
+The following are two separate APIs to support the "add to home" feature.
+
 \code
 typedef int (*result_cb_t)(int ret, void *data)
 
@@ -81,11 +81,11 @@ Then, the information will be shown and used in home screen when a user selects
 <caption>Syntax of the shortcut manifest file</caption>
 <TR><TD>
 \code
-<manifest xmlns="http://tizen.org/ns/packages" package="com.samsung.APP_PKGNAME">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.APP_PKGNAME">
 ...
     <shortcut-list>
-        <shortcut appid="com.samsung.myapp" extra_key="key_string" extra_data="data_string_for_key">
-           <icon>com.samsung.myapp-shortcut.png</icon>
+        <shortcut appid="org.tizen.myapp" extra_key="key_string" extra_data="data_string_for_key">
+           <icon>org.tizen.myapp-shortcut.png</icon>
            <label>Default name</label>
            <label xml:lang="en-us">Name en</label>
            <label xml:lang="nl-nl">Name nl</label>
@@ -103,13 +103,13 @@ Then, the information will be shown and used in home screen when a user selects
            <label xml:lang="fr-fr">Name fr</label>
            <label xml:lang="ko-kr">Name kr</label>
         </shortcut>
-        <shortcut appid="com.samsung.myapp" extra_key="key_string" extra_data="data_string_for_key">
+        <shortcut appid="org.tizen.myapp" extra_key="key_string" extra_data="data_string_for_key">
            <label>Default name</label>
         </shortcut>
         ...
-        <shortcut appid="com.samsung.myapp" extra_key="key_string" extra_data="data_string_for_key">
+        <shortcut appid="org.tizen.myapp" extra_key="key_string" extra_data="data_string_for_key">
            <label>Default name</label>
-           <icon>com.samsung.myapp2.png</icon>
+           <icon>org.tizen.myapp2.png</icon>
         </shortcut>
     </shortcut-list>
 ...

diff --git a/lib/include/shortcut.h b/lib/include/shortcut.h
index 17671de..d7355a9 100755 (executable)
--- a/lib/include/shortcut.h
+++ b/lib/include/shortcut.h
@@ -51,7 +51,7 @@ extern "C" {
  *                            otherwise a shourtcut should exist only once
  * @param[in] data The callback data
  * @return The result of handling a shortcut creation request\n
- *             This returns @c 0 if the add_to_home request is handled successfully, 
+ *             This returns @c 0 if the add_to_home request is handled successfully,
  *             otherwise it returns a proper errno.
  * @see shortcut_set_request_cb()
  */
@@ -60,7 +60,7 @@ typedef int (*request_cb_t)(const char *appid, const char *name, int type, const
 /**
  * @brief Called to receive the result of add_to_home_shortcut().
  * @since_tizen 2.3
- * @param[in] ret The result value, it could be @c 0 if it succeeds to add a shortcut, 
+ * @param[in] ret The result value, it could be @c 0 if it succeeds to add a shortcut,
  *                otherwise it returns an errno
  * @param[in] pid The process ID of who handle this add_to_home request
  * @param[in] data The callback data
@@ -292,7 +292,7 @@ extern int shortcut_set_request_cb(request_cb_t request_cb, void *data);
  *
  * static int app_create(void *data)
  * {
- *     add_to_home_shortcut("com.samsung.gallery", "With friends",
+ *     add_to_home_shortcut("org.tizen.gallery", "With friends",
  *                                     LAUNCH_BY_URI, "gallery:0000-0000",
  *                                     "/opt/media/Pictures/Friends.jpg", 0, result_cb, NULL);
  *     return 0;
@@ -415,7 +415,7 @@ extern int shortcut_get_list(const char *appid, int (*cb)(const char *appid, con
  *
  * static int app_create(void *data)
  * {
- *     add_to_home_dynamicbox("com.samsung.gallery.dynamicbox", "With friends",
+ *     add_to_home_dynamicbox("org.tizen.gallery.dynamicbox", "With friends",
  *                                     LAUNCH_BY_URI, "gallery:0000-0000",
  *                                     "/opt/media/Pictures/Friends.jpg", -1.0f, 0, result_cb, NULL);
  *     return 0;

diff --git a/lib/include/shortcut_private.h b/lib/include/shortcut_private.h
index 096e7b6..5edf43e 100755 (executable)
--- a/lib/include/shortcut_private.h
+++ b/lib/include/shortcut_private.h
@@ -116,7 +116,7 @@ extern FILE *__file_log_fp;
  *
  * static int app_create(void *data)
  * {
- *     add_to_home_remove_shortcut("com.samsung.gallery.dynamicbox", "With friends",
+5 *    add_to_home_remove_shortcut("org.tizen.gallery.dynamicbox", "With friends",
  *                                     "gallery:0000-0000",
  *                                     result_cb, NULL);
  *     return 0;
@@ -188,7 +188,7 @@ extern int add_to_home_remove_shortcut(const char *appid, const char *name, cons
  *
  * static int app_create(void *data)
  * {
- *     add_to_home_remove_dynamicbox("com.samsung.gallery.dynamicbox", "With friends", result_cb, NULL);
+ *     add_to_home_remove_dynamicbox("org.tizen.gallery.dynamicbox", "With friends", result_cb, NULL);
  *     return 0;
  * }
  *

diff --git a/lib/include/shortcut_product.h b/lib/include/shortcut_product.h
index 4f4932b..927e214 100755 (executable)
--- a/lib/include/shortcut_product.h
+++ b/lib/include/shortcut_product.h
@@ -64,7 +64,7 @@ extern "C" {
  *     if (!handle) {
  *         ...
  *     }
- * 
+ *
  *     // Send the request to the shortcut service
  *     ret = shortcut_icon_request_set_info(handle, NULL, SHORTCUT_ICON_TYPE_IMAGE, "icon, "/usr/share/.../icon.png", NULL, NULL);
  *     if (ret < 0) {
@@ -76,7 +76,7 @@ extern "C" {
  *        ...
  *     }
  *
- *     ret = shortcut_icon_request_send(handle, LB_SIZE_TYPE_1x1, NULL, NULL, "/opt/usr/apps/com.samsung.cluster-home/data/out.png", result_cb, NULL);
+ *     ret = shortcut_icon_request_send(handle, LB_SIZE_TYPE_1x1, NULL, NULL, "/opt/usr/apps/org.tizen.cluster-home/data/out.png", result_cb, NULL);
  *     if (ret < 0) {
  *        ...
  *     }

diff --git a/sample.xml b/sample.xml
old mode 100644 (file)
new mode 100755 (executable)
index f3a6bc8..0e471a0
--- a/sample.xml
+++ b/sample.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns="http://tizen.org/ns/packages" package="com.samsung.myapp" version="0.3.5" install-location="auto">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.myapp" version="0.3.5" install-location="auto">
 <shortcut-list test="a">
-       <shortcut appid="com.samsung.myapp" extra_key="key" extra_data="SERVICE INFORMATION 1">
-               <icon>/opt/usr/apps/com.samsung.myapp/res/icon/myapp_shortcut01.png</icon>
+       <shortcut appid="org.tizen.myapp" extra_key="key" extra_data="SERVICE INFORMATION 1">
+               <icon>/opt/usr/apps/org.tizen.myapp/res/icon/myapp_shortcut01.png</icon>
                <label>Default Name</label>
                <label xml:lang="en-us">Name en</label>
                <label xml:lang="nl-nl">Name nl</label>
@@ -20,8 +20,8 @@
                <label xml:lang="fr-fr">Name fr</label>
                <label xml:lang="kor-kr">Name kr</label>
        </shortcut>
-       <shortcut appid="com.samsung.myapp-gadget" extra_key="key" extra_data="SERVICE INFORMATION 2">
-               <icon>/opt/usr/apps/com.samsung.myapp/res/icon/gadget_shortcut01.png</icon>
+       <shortcut appid="org.tizen.myapp-gadget" extra_key="key" extra_data="SERVICE INFORMATION 2">
+               <icon>/opt/usr/apps/org.tizen.myapp/res/icon/gadget_shortcut01.png</icon>
                <label>Default Name 02</label>
                <label xml:lang="en-us">Name en</label>
                <label xml:lang="nl-nl">Name nl</label>
@@ -39,8 +39,8 @@
                <label xml:lang="fr-fr">Name fr</label>
                <label xml:lang="kor-kr">Name kr</label>
        </shortcut>
-       <shortcut appid="com.samsung.myapp" extra_key="key" extra_data="SERVICE INFORMATION 3">
-               <icon>/opt/usr/apps/com.samsung.myapp/res/icon/mayapp_shortcut02.png</icon>
+       <shortcut appid="org.tizen.myapp" extra_key="key" extra_data="SERVICE INFORMATION 3">
+               <icon>/opt/usr/apps/org.tizen.myapp/res/icon/mayapp_shortcut02.png</icon>
                <label>Default Name 03</label>
                <label xml:lang="en-us">Name en</label>
                <label xml:lang="nl-nl">Name nl</label>

diff --git a/test/icon.c b/test/icon.c
index 4f1364d..28d5b6f 100755 (executable)
--- a/test/icon.c
+++ b/test/icon.c
@@ -41,7 +41,7 @@ static Eina_Bool test_main(void *data)
        }
 
        printf("Test: %d\n", idx);
-       ret = shortcut_icon_request_set_info(handle, NULL, SHORTCUT_ICON_TYPE_IMAGE, DEFAULT_ICON_PART, "/usr/share/icons/default/small/com.samsung.music-player.png", NULL, NULL);
+       ret = shortcut_icon_request_set_info(handle, NULL, SHORTCUT_ICON_TYPE_IMAGE, DEFAULT_ICON_PART, "/usr/share/icons/default/small/org.tizen.music-player.png", NULL, NULL);
        printf("NAME set_info: %d\n", ret);
 
        snprintf(filename, sizeof(filename), "App Name %d", idx);

diff --git a/test_db_builder.sh b/test_db_builder.sh
index 0bb675d..302076e 100755 (executable)
--- a/test_db_builder.sh
+++ b/test_db_builder.sh
@@ -19,11 +19,11 @@
 DBFILE="/opt/dbspace/.shortcut_service.db"
 
 APPID=(
-"com.samsung.facebook"
-"com.samsung.facebook"
-"com.samsung.facebook"
-"com.samsung.facebook"
-"com.samsung.facebook"
+"org.tizen.facebook"
+"org.tizen.facebook"
+"org.tizen.facebook"
+"org.tizen.facebook"
+"org.tizen.facebook"
 )
 
 ICON=(