Upload Tizen2.0 source

Change-Id: I1f144b46e3cc56da809aeb1700aac407423c89d7

40 files changed, 516 insertions, 3070 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15fe626..0f7c521 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 INCLUDE(FindPkgConfig)
 
 pkg_check_modules(pkgs REQUIRED dlog ecore x11 libprivilege-control aul)
-pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0)
+pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 ecore-x ecore libsoup-2.4)
 
 FIND_LIBRARY(LIB_DL dl)
 
diff --git a/TC/build.sh b/TC/build.sh
deleted file mode 100755
index e7a9432..0000000
--- a/TC/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-export TET_INSTALL_PATH=$HOME/git/tetware/TETware  # local tetware path
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-export TET_ROOT=$TET_TARGET_PATH
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -c -p ./
-tcc -b -j $JOURNAL_RESULT -p ./
-grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/execute.sh b/TC/execute.sh
deleted file mode 100755
index a119011..0000000
--- a/TC/execute.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-export TET_INSTALL_PATH=/mnt/nfs/git/tetware/TETware
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-
-export TET_ROOT=$TET_TARGET_PATH
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -e -j $JOURNAL_RESULT -p ./
-grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/tet_code b/TC/tet_code
deleted file mode 100755
index a2cf6c1..0000000
--- a/TC/tet_code
+++ /dev/null
@@ -1,12 +0,0 @@
-# TET reserved codes
-0 "PASS"
-1 "FAIL"
-2 "UNRESOLVED"
-3 "NOTINUSE"
-4 "UNSUPPORTED"
-5 "UNTESTED"
-6 "UNINITIATED"
-7 "NORESULT"
-
-# Test suite additional codes
-33 "INSPECT"
diff --git a/TC/tet_scen b/TC/tet_scen
deleted file mode 100755
index 43cbc9b..0000000
--- a/TC/tet_scen
+++ /dev/null
@@ -1,7 +0,0 @@
-all
-	^TEST
-##### Scenarios for TEST #####
-
-# Test scenario
-TEST
-	:include:/unit/tslist
diff --git a/TC/tetbuild.cfg b/TC/tetbuild.cfg
deleted file mode 100755
index f85c948..0000000
--- a/TC/tetbuild.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-TET_OUTPUT_CAPTURE=False
-TET_BUILD_TOOL=make
-TET_PASS_TC_NAME=True
-TET_API_COMPLIANT=False
diff --git a/TC/tetclean.cfg b/TC/tetclean.cfg
deleted file mode 100755
index c66eda4..0000000
--- a/TC/tetclean.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-TET_OUTPUT_CAPTURE=False
-TET_CLEAN_TOOL=make clean
diff --git a/TC/tetexec.cfg b/TC/tetexec.cfg
deleted file mode 100755
index 0d9d39a..0000000
--- a/TC/tetexec.cfg
+++ /dev/null
@@ -1 +0,0 @@
-TET_OUTPUT_CAPTURE=False
diff --git a/TC/unit/Makefile b/TC/unit/Makefile
deleted file mode 100755
index 37cfa2e..0000000
--- a/TC/unit/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-CC ?= gcc
-
-TARGETS = 	utc_ApplicationFW_appsvc_set_operation_func \
-		utc_ApplicationFW_appsvc_set_uri_func \
-		utc_ApplicationFW_appsvc_set_mime_func \
-		utc_ApplicationFW_appsvc_add_data_func \
-		utc_ApplicationFW_appsvc_add_data_array_func \
-		utc_ApplicationFW_appsvc_set_pkgname_func \
-		utc_ApplicationFW_appsvc_run_service_func \
-		utc_ApplicationFW_appsvc_get_list_func \
-		utc_ApplicationFW_appsvc_get_operation_func \
-		utc_ApplicationFW_appsvc_get_mime_func \
-		utc_ApplicationFW_appsvc_get_uri_func \
-		utc_ApplicationFW_appsvc_get_pkgname_func \
-		utc_ApplicationFW_appsvc_is_defapp_func \
-		utc_ApplicationFW_appsvc_data_is_array_func \
-		utc_ApplicationFW_appsvc_set_defapp_func \
-		utc_ApplicationFW_appsvc_unset_defapp_func \
-		utc_ApplicationFW_appsvc_get_data_func \
-		utc_ApplicationFW_appsvc_get_data_array_func \
-		utc_ApplicationFW_appsvc_create_result_bundle_func \
-		utc_ApplicationFW_appsvc_send_result_func
-
-PKGS = bundle appsvc
-
-LDFLAGS = `pkg-config --libs $(PKGS)`
-LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
-
-CFLAGS = -I. `pkg-config --cflags $(PKGS)`
-CFLAGS += -I$(TET_ROOT)/inc/tet3
-CFLAGS += -Wall
-
-all: $(TARGETS)
-
-$(TARGETS): %: %.c
-	$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
-
-clean:
-	rm -f $(TARGETS)
diff --git a/TC/unit/tc_gen.sh b/TC/unit/tc_gen.sh
deleted file mode 100755
index 54f482d..0000000
--- a/TC/unit/tc_gen.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-TMPSTR=$0
-SCRIPT=${TMPSTR##*/}
-
-if [ $# -lt 2 ]; then
-	echo "Usage) $SCRIPT module_name api_name"
-	exit 1
-fi
-
-MODULE=$1
-API=$2
-TEMPLATE=utc_MODULE_API_func.c.in
-TESTCASE=utc_${MODULE}_${API}_func
-
-sed -e	'
-	s^@API@^'"$API"'^g
-	s^@MODULE@^'"$MODULE"'^g
-	' $TEMPLATE > $TESTCASE.c
-
-if [ ! -e "$TESTCASE.c" ]; then
-	echo "Failed"
-	exit 1
-fi
-echo "Testcase file is $TESTCASE.c"
-echo "Done"
-echo "please put \"$TESTCASE\" as Target in Makefile"
-echo "please put \"/unit/$TESTCASE\" in tslist"
diff --git a/TC/unit/tslist b/TC/unit/tslist
deleted file mode 100755
index a3d835d..0000000
--- a/TC/unit/tslist
+++ /dev/null
@@ -1,20 +0,0 @@
-/unit/utc_ApplicationFW_appsvc_set_operation_func
-/unit/utc_ApplicationFW_appsvc_set_uri_func
-/unit/utc_ApplicationFW_appsvc_set_mime_func
-/unit/utc_ApplicationFW_appsvc_add_data_func
-/unit/utc_ApplicationFW_appsvc_add_data_array_func
-/unit/utc_ApplicationFW_appsvc_set_pkgname_func
-/unit/utc_ApplicationFW_appsvc_run_service_func
-/unit/utc_ApplicationFW_appsvc_get_list_func
-/unit/utc_ApplicationFW_appsvc_get_operation_func
-/unit/utc_ApplicationFW_appsvc_get_mime_func
-/unit/utc_ApplicationFW_appsvc_get_uri_func
-/unit/utc_ApplicationFW_appsvc_get_pkgname_func
-/unit/utc_ApplicationFW_appsvc_is_defapp_func
-/unit/utc_ApplicationFW_appsvc_data_is_array_func
-/unit/utc_ApplicationFW_appsvc_set_defapp_func
-/unit/utc_ApplicationFW_appsvc_unset_defapp_func
-/unit/utc_ApplicationFW_appsvc_get_data_func
-/unit/utc_ApplicationFW_appsvc_get_data_array_func
-/unit/utc_ApplicationFW_appsvc_create_result_bundle_func
-/unit/utc_ApplicationFW_appsvc_send_result_func
diff --git a/TC/unit/utc_ApplicationFW_appsvc_add_data_array_func.c b/TC/unit/utc_ApplicationFW_appsvc_add_data_array_func.c
deleted file mode 100644
index d08e117..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_add_data_array_func.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_add_data_array_func_01(void);
-static void utc_appsvc_add_data_array_func_02(void);
-static void utc_appsvc_add_data_array_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_add_data_array_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_add_data_array_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_add_data_array_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_add_data_array start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_add_data_array ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_add_data_array()
- */
-static void utc_appsvc_add_data_array_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	const char *images[] = { "/opt/media/a.jpg",
-		"/opt/media/b.jpg", "/opt/media/c.jpg"
-	};
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, APPSVC_DATA_SELECTED, images, 3);
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_add_data_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_add_data_array()
- */
-static void utc_appsvc_add_data_array_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	const char *images[] = { "/opt/media/a.jpg",
-		"/opt/media/b.jpg", "/opt/media/c.jpg"
-	};
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, NULL, images, 3);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_add_data_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_add_data_array()
- */
-static void utc_appsvc_add_data_array_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, APPSVC_DATA_SELECTED, NULL, 3);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_add_data_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_add_data_func.c b/TC/unit/utc_ApplicationFW_appsvc_add_data_func.c
deleted file mode 100644
index 488b6f5..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_add_data_func.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_add_data_func_01(void);
-static void utc_appsvc_add_data_func_02(void);
-static void utc_appsvc_add_data_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_add_data_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_add_data_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_add_data_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_add_data start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_add_data ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_add_data()
- */
-static void utc_appsvc_add_data_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data(b, APPSVC_DATA_CC, "abcd@samsung.com");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_add_data test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_add_data()
- */
-static void utc_appsvc_add_data_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data(b, NULL, "abcd@samsung.com");
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_add_data test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_add_data()
- */
-static void utc_appsvc_add_data_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data(b, APPSVC_DATA_CC, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_add_data test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_add_data test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_create_result_bundle_func.c b/TC/unit/utc_ApplicationFW_appsvc_create_result_bundle_func.c
deleted file mode 100644
index 27f54dd..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_create_result_bundle_func.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_create_result_bundle_func_01(void);
-static void utc_appsvc_create_result_bundle_func_02(void);
-static void utc_appsvc_create_result_bundle_func_03(void);
-static void utc_appsvc_create_result_bundle_func_04(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_create_result_bundle_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_create_result_bundle_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_create_result_bundle_func_03, NEGATIVE_TC_IDX},
-	{utc_appsvc_create_result_bundle_func_04, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_create_result_bundle starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_create_result_bundle ends");
-}
-
-/**
- * @brief Positive test case of appsvc_create_result_bundle()
- */
-static void utc_appsvc_create_result_bundle_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	bundle *outb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(inb, "__AUL_ORG_CALLER_PID__", "2000");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_create_result_bundle(inb, &outb);
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_create_result_bundle test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_create_result_bundle test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-	if (outb != NULL) {
-		bundle_free(outb);
-	}
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_create_result_bundle()
- */
-static void utc_appsvc_create_result_bundle_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *outb = NULL;
-	ret = appsvc_create_result_bundle(NULL, &outb);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_create_result_bundle test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_create_result_bundle test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	if (outb != NULL) {
-		bundle_free(outb);
-	}
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_create_result_bundle()
- */
-static void utc_appsvc_create_result_bundle_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	bundle *outb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_create_result_bundle(inb, &outb);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_create_result_bundle test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_create_result_bundle test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-	if (outb != NULL) {
-		bundle_free(outb);
-	}
-}
-
-/**
- * @brief Negative test case of appsvc_create_result_bundle()
- */
-static void utc_appsvc_create_result_bundle_func_04(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_create_result_bundle(inb, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_create_result_bundle test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_create_result_bundle test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_data_is_array_func.c b/TC/unit/utc_ApplicationFW_appsvc_data_is_array_func.c
deleted file mode 100644
index ac3c6ed..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_data_is_array_func.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_data_is_array_func_01(void);
-static void utc_appsvc_data_is_array_func_02(void);
-static void utc_appsvc_data_is_array_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_data_is_array_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_data_is_array_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_data_is_array_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_data_is_array()
- */
-static void utc_appsvc_data_is_array_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	const char *images[] = { "/opt/media/a.jpg",
-		"/opt/media/b.jpg", "/opt/media/c.jpg"
-	};
-	bundle *b = NULL;
-
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, APPSVC_DATA_SELECTED, images, 3);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_data_is_array(b, APPSVC_DATA_SELECTED);
-	if (ret == 1) {
-		tet_infoline("appsvc_data_is_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_data_is_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
-
-/**
- * @brief Negative test case of appsvc_data_is_array()
- */
-static void utc_appsvc_data_is_array_func_02(void)
-{
-	int ret = 0;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data(b, APPSVC_DATA_CC, "abcd@samsung.com");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_data_is_array(b, APPSVC_DATA_CC);
-	if (ret == 0) {
-		tet_infoline("appsvc_data_is_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_data_is_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_data_is_array()
- */
-static void utc_appsvc_data_is_array_func_03(void)
-{
-	int ret = 0;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_data_is_array(b, APPSVC_DATA_SELECTED);
-	if (ret == 0) {
-		tet_infoline("appsvc_data_is_array test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_data_is_array test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_data_array_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_data_array_func.c
deleted file mode 100644
index b9aca50..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_data_array_func.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_data_array_func_01(void);
-static void utc_appsvc_get_data_array_func_02(void);
-static void utc_appsvc_get_data_array_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_data_array_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_data_array_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_get_data_array_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_get_data_array()
- */
-static void utc_appsvc_get_data_array_func_01(void)
-{
-	const char **ret_array = NULL;
-	const char *images[] = { "/opt/media/a.jpg",
-		"/opt/media/b.jpg", "/opt/media/c.jpg"
-	};
-	bundle *b = NULL;
-	int len = 0;
-	int ret = APPSVC_RET_OK;
-
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, APPSVC_DATA_SELECTED, images, 3);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_array = appsvc_get_data_array(b, APPSVC_DATA_SELECTED, &len);
-	if (ret_array != NULL) {
-		tet_infoline("appsvc_get_data_array test PASS!");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data_array test FAIL!");
-		tet_printf("ret_array = NULL");
-		tet_result(TET_FAIL);
-	}
-
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_data_array()
- */
-static void utc_appsvc_get_data_array_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	const char **ret_array = NULL;
-	const char *images[] = { "/opt/media/a.jpg",
-		"/opt/media/b.jpg", "/opt/media/c.jpg"
-	};
-	bundle *b = NULL;
-	int len = 0;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data_array(b, APPSVC_DATA_SELECTED, images, 3);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_array = appsvc_get_data_array(b, NULL, &len);
-	if (ret_array == NULL) {
-		tet_infoline("appsvc_get_data_array test PASS!");
-		tet_printf("ret_array = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data_array test FAIL!");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_data_array()
- */
-static void utc_appsvc_get_data_array_func_03(void)
-{
-	const char **ret_array = NULL;
-	int len = 0;
-
-	ret_array = appsvc_get_data_array(NULL, NULL, &len);
-	if (ret_array == NULL) {
-		tet_infoline("appsvc_get_data_array test PASS!");
-		tet_printf("ret_array = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data_array test FAIL!");
-		tet_result(TET_FAIL);
-	}
-
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_data_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_data_func.c
deleted file mode 100644
index 51fcdb4..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_data_func.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_data_func_01(void);
-static void utc_appsvc_get_data_func_02(void);
-static void utc_appsvc_get_data_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_data_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_data_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_get_data_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_get_data()
- */
-static void utc_appsvc_get_data_func_01(void)
-{
-	const char *ret_data = NULL;
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_add_data(b, APPSVC_DATA_CC, "abcd@samsung.com");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_data = appsvc_get_data(b, APPSVC_DATA_CC);
-	if (ret_data != NULL) {
-		tet_infoline("appsvc_get_data test PASS!");
-		tet_printf("ret = %s", ret_data);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data test FAIL!");
-		tet_printf("ret = NULL");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_data()
- */
-static void utc_appsvc_get_data_func_02(void)
-{
-	const char *ret_data = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_data = appsvc_get_data(b, APPSVC_DATA_CC);
-	if (ret_data == NULL) {
-		tet_infoline("appsvc_get_data test PASS!");
-		tet_printf("ret = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data test FAIL!");
-		tet_printf("ret = %s", ret_data);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_data()
- */
-static void utc_appsvc_get_data_func_03(void)
-{
-	const char *ret_data = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_data = appsvc_get_data(NULL, APPSVC_DATA_CC);
-	if (ret_data == NULL) {
-		tet_infoline("appsvc_get_data test PASS!");
-		tet_printf("ret_data = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_data test FAIL!");
-		tet_printf("ret_data = %s", ret_data);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_list_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_list_func.c
deleted file mode 100644
index d10c2f8..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_list_func.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_list_func_01(void);
-static void utc_appsvc_get_list_func_02(void);
-static void utc_appsvc_get_list_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_list_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_list_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_get_list_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_get_list starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_get_list ends");
-}
-
-static void iter_function(const char *pkg_name, void *data)
-{
-	tet_printf("Pkg name is %s", pkg_name);
-	return;
-}
-
-/**
- * @brief Positive test case of appsvc_get_list()
- */
-static void utc_appsvc_get_list_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, APPSVC_OPERATION_PICK);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_get_list(b, (void *)iter_function, NULL);
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_get_list test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_list test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_list()
- */
-static void utc_appsvc_get_list_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, APPSVC_OPERATION_DEFAULT);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_get_list(b, (void *)iter_function, NULL);
-	if (ret == APPSVC_RET_ENOMATCH) {
-		tet_infoline("appsvc_get_list test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_list test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_list()
- */
-static void utc_appsvc_get_list_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_get_list(NULL, NULL, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_get_list test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_list test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_mime_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_mime_func.c
deleted file mode 100644
index f228414..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_mime_func.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_mime_func_01(void);
-static void utc_appsvc_get_mime_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_mime_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_mime_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_get_mime starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_get_mime ends");
-}
-
-/**
- * @brief Positive test case of appsvc_get_mime()
- */
-static void utc_appsvc_get_mime_func_01(void)
-{
-	const char *ret_mime = NULL;
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_mime(b, "image/jpg");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_mime = appsvc_get_mime(b);
-	if (ret_mime != NULL) {
-		tet_infoline("appsvc_get_mime test PASS!");
-		tet_printf("ret = %s", ret_mime);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_mime test FAIL!");
-		tet_printf("ret_mime = NULL");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_mime()
- */
-static void utc_appsvc_get_mime_func_02(void)
-{
-	const char *ret_mime = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_mime = appsvc_get_mime(b);
-	if (ret_mime == NULL) {
-		tet_infoline("appsvc_get_mime test PASS!");
-		tet_printf("ret_mime = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_mime test FAIL!");
-		tet_printf("ret = %s", ret_mime);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_operation_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_operation_func.c
deleted file mode 100644
index b67b8ae..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_operation_func.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_operation_func_01(void);
-static void utc_appsvc_get_operation_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_operation_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_operation_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_get_operation starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_get_operation ends");
-}
-
-/**
- * @brief Positive test case of appsvc_get_operation()
- */
-static void utc_appsvc_get_operation_func_01(void)
-{
-	const char *ret_operation = NULL;
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, APPSVC_OPERATION_VIEW);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_operation = appsvc_get_operation(b);
-	if (ret_operation != NULL) {	/*TODO: check content */
-		tet_infoline("appsvc_get_operation test PASS!");
-		tet_printf("ret = %s", ret_operation);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_operation test FAIL!");
-		tet_printf("ret is NULL");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_operation()
- */
-static void utc_appsvc_get_operation_func_02(void)
-{
-	const char *ret_operation = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_operation = appsvc_get_operation(b);
-	if (ret_operation == NULL) {
-		tet_infoline("appsvc_get_operation test PASS!");
-		tet_printf("ret is NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_operation test FAIL!");
-		tet_printf("ret = %s", ret_operation);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_pkgname_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_pkgname_func.c
deleted file mode 100644
index f61925c..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_pkgname_func.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_pkgname_func_01(void);
-static void utc_appsvc_get_pkgname_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_pkgname_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_pkgname_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_get_pkgname starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_get_pkgname ends");
-}
-
-/**
- * @brief Positive test case of appsvc_get_pkgname()
- */
-static void utc_appsvc_get_pkgname_func_01(void)
-{
-	const char *ret_pkgname = NULL;
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_pkgname(b, "org.tizen.gallery");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_pkgname = appsvc_get_pkgname(b);
-	if (ret_pkgname != NULL) {
-		tet_infoline("appsvc_get_pkgname test PASS!");
-		tet_printf("ret = %s", ret_pkgname);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_pkgname test FAIL!");
-		tet_printf("ret = NULL");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_pkgname()
- */
-static void utc_appsvc_get_pkgname_func_02(void)
-{
-	const char *ret_pkgname = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_pkgname = appsvc_get_pkgname(b);
-	if (ret_pkgname == NULL) {
-		tet_infoline("appsvc_get_pkgname test PASS!");
-		tet_printf("ret_pkgname = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_pkgname test FAIL!");
-		tet_printf("ret_pkgname = %s", ret_pkgname);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_get_uri_func.c b/TC/unit/utc_ApplicationFW_appsvc_get_uri_func.c
deleted file mode 100644
index 40567d6..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_get_uri_func.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_get_uri_func_01(void);
-static void utc_appsvc_get_uri_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_get_uri_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_get_uri_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_get_uri start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_get_uri ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_get_uri()
- */
-static void utc_appsvc_get_uri_func_01(void)
-{
-	const char *ret_uri = NULL;
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_uri(b, "http://www.samsung.com");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret_uri = appsvc_get_uri(b);
-	if (ret_uri != NULL) {
-		tet_infoline("appsvc_get_uri test PASS!");
-		tet_printf("ret_uri = %s", ret_uri);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_uri test FAIL!");
-		tet_printf("ret_uri = NULL");
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_get_uri()
- */
-static void utc_appsvc_get_uri_func_02(void)
-{
-	const char *ret_uri = NULL;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret_uri = appsvc_get_uri(b);
-	if (ret_uri == NULL) {
-		tet_infoline("appsvc_get_uri test PASS!");
-		tet_printf("ret = NULL");
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_get_uri test FAIL!");
-		tet_printf("ret_uri = %s", ret_uri);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_is_defapp_func.c b/TC/unit/utc_ApplicationFW_appsvc_is_defapp_func.c
deleted file mode 100644
index edf2674..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_is_defapp_func.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_is_defapp_func_01(void);
-static void utc_appsvc_is_defapp_func_02(void);
-static void utc_appsvc_is_defapp_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_is_defapp_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_is_defapp_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_is_defapp_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_is_defapp starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_is_defapp ends");
-}
-
-/**
- * @brief Positive test case of appsvc_is_defapp()
- */
-static void utc_appsvc_is_defapp_func_01(void)
-{
-	int ret = 0;
-	ret =
-	    appsvc_set_defapp("http://tizen.org/appsvc/operation/abcd123", NULL, NULL,
-			      "org.tizen.abcd123");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_is_defapp("org.tizen.abcd123");
-	if (ret == 1) {
-		tet_infoline("appsvc_is_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_is_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	appsvc_unset_defapp("org.tizen.abcd123");
-}
-
-/**
- * @brief Negative test case of appsvc_is_defapp()
- */
-static void utc_appsvc_is_defapp_func_02(void)
-{
-	int ret = 0;
-	ret = appsvc_is_defapp("org.tizen.abcdefgh");
-	if (ret == 0) {
-		tet_infoline("appsvc_is_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_is_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
-
-/**
- * @brief Negative test case of appsvc_is_defapp()
- */
-static void utc_appsvc_is_defapp_func_03(void)
-{
-	int ret = 0;
-	ret = appsvc_is_defapp(NULL);
-	if (ret == 0) {
-		tet_infoline("appsvc_is_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_is_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_run_service_func.c b/TC/unit/utc_ApplicationFW_appsvc_run_service_func.c
deleted file mode 100644
index 9db2f37..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_run_service_func.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_run_service_func_01(void);
-static void utc_appsvc_run_service_func_02(void);
-static void utc_appsvc_run_service_func_03(void);
-static void utc_appsvc_run_service_func_04(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_run_service_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_run_service_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_run_service_func_03, NEGATIVE_TC_IDX},
-	{utc_appsvc_run_service_func_04, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_run_service starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_run_service ends");
-}
-
-/**
- * @brief Positive test case of appsvc_run_service()
- */
-static void utc_appsvc_run_service_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, APPSVC_OPERATION_PICK);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_mime(b, "image/jpg");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_run_service(b, 0, NULL, (void *)NULL);
-	if (ret > APPSVC_RET_OK) {	/*Return value is pid of the application */
-		tet_infoline("appsvc_run_service test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_run_service test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_run_service()
- */
-static void utc_appsvc_run_service_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_run_service(NULL, 0, NULL, (void *)NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("1appsvc_run_service test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("1appsvc_run_service test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_run_service()
- */
-static void utc_appsvc_run_service_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_mime(b, "abcdefgh");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_run_service(b, 0, NULL, (void *)NULL);
-	if (ret == APPSVC_RET_ENOMATCH) {
-		tet_infoline("appsvc_run_service test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_run_service test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_run_service()
- */
-static void utc_appsvc_run_service_func_04(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_pkgname(b, "\0");
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(b);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_run_service(b, 0, NULL, (void *)NULL);
-	if (ret == APPSVC_RET_ELAUNCH) {
-		tet_infoline("appsvc_run_service test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_run_service test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_send_result_func.c b/TC/unit/utc_ApplicationFW_appsvc_send_result_func.c
deleted file mode 100644
index 7ad2c34..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_send_result_func.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_send_result_func_01(void);
-static void utc_appsvc_send_result_func_02(void);
-static void utc_appsvc_send_result_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_send_result_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_send_result_func_02, POSITIVE_TC_IDX},
-	{utc_appsvc_send_result_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_send_result starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_send_result ends");
-}
-
-/**
- * @brief Positive test case of appsvc_send_result()
- */
-static void utc_appsvc_send_result_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	bundle *outb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(inb, "__AUL_ORG_CALLER_PID__", "1234");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_create_result_bundle(inb, &outb);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		if (outb) {
-			bundle_free(outb);
-		}
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(outb, "result", "1");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		bundle_free(outb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_send_result(outb, 0);
-
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_send_result test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_send_result test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-	bundle_free(outb);
-}
-
-/**
- * @brief Positive test case of appsvc_send_result()
- */
-static void utc_appsvc_send_result_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	bundle *outb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(inb, "__AUL_ORG_CALLER_PID__", "1234");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_create_result_bundle(inb, &outb);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		if (outb) {
-			bundle_free(outb);
-		}
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = bundle_add(outb, "result", "1");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		bundle_free(outb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_send_result(outb, -1);
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_send_result test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_send_result test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-	bundle_free(outb);
-}
-
-/**
- * @brief Negative test case of appsvc_send_result()
- */
-static void utc_appsvc_send_result_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *inb = NULL;
-	bundle *outb = NULL;
-	inb = bundle_create();
-	if (inb == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(inb, "__AUL_ORG_CALLER_PID__", "1234");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_create_result_bundle(inb, &outb);
-	if (ret != APPSVC_RET_OK) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		if (outb) {
-			bundle_free(outb);
-		}
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = bundle_add(outb, "result", "1");
-	if (ret != 0) {
-		tet_infoline("Test initialization failed!!!");
-		bundle_free(inb);
-		bundle_free(outb);
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_send_result(outb, -2);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_send_result test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_send_result test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(inb);
-	bundle_free(outb);
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_set_defapp_func.c b/TC/unit/utc_ApplicationFW_appsvc_set_defapp_func.c
deleted file mode 100644
index 46921e1..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_set_defapp_func.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_set_defapp_func_01(void);
-static void utc_appsvc_set_defapp_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_set_defapp_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_set_defapp_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_defapp starts");
-	appsvc_unset_defapp("org.tizen.abcd");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_defapp ends");
-	appsvc_unset_defapp("org.tizen.abcd12");
-}
-
-/**
- * @brief Positive test case of appsvc_set_defapp()
- */
-static void utc_appsvc_set_defapp_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret =
-	    appsvc_set_defapp("http://tizen.org/appsvc/operation/abcd12", NULL, NULL,
-			      "org.tizen.abcd12");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_set_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
-
-/**
- * @brief Negative test case of appsvc_set_defapp()
- */
-static void utc_appsvc_set_defapp_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_set_defapp("http://tizen.org/appsvc/operation/abcd", NULL, NULL, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_set_mime_func.c b/TC/unit/utc_ApplicationFW_appsvc_set_mime_func.c
deleted file mode 100644
index f88912e..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_set_mime_func.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_set_mime_func_01(void);
-static void utc_appsvc_set_mime_func_02(void);
-static void utc_appsvc_set_mime_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_set_mime_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_set_mime_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_set_mime_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_mime starts");
-	return;
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_mime ends");
-	return;
-}
-
-/**
- * @brief Positive test case of appsvc_set_mime()
- */
-static void utc_appsvc_set_mime_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_mime(b, "image/jpg");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_set_mime test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_mime test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_mime()
- */
-static void utc_appsvc_set_mime_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_mime(b, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_mime test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_mime test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_mime()
- */
-static void utc_appsvc_set_mime_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_set_mime(NULL, "image/jpg");
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_mime test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_mime test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_set_operation_func.c b/TC/unit/utc_ApplicationFW_appsvc_set_operation_func.c
deleted file mode 100644
index ee3008f..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_set_operation_func.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_set_operation_func_01(void);
-static void utc_appsvc_set_operation_func_02(void);
-static void utc_appsvc_set_operation_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_set_operation_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_set_operation_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_set_operation_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_operation starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_operation ends");
-}
-
-/**
- * @brief Positive test case of appsvc_set_operation()
- */
-static void utc_appsvc_set_operation_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, APPSVC_OPERATION_VIEW);
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_set_operation test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_operation test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_operation()
- */
-static void utc_appsvc_set_operation_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_operation(b, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_operation test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_operation test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_operation()
- */
-static void utc_appsvc_set_operation_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_set_operation(NULL, APPSVC_OPERATION_VIEW);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_operation test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_operation test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_set_pkgname_func.c b/TC/unit/utc_ApplicationFW_appsvc_set_pkgname_func.c
deleted file mode 100644
index e4d8387..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_set_pkgname_func.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_set_pkgname_func_01(void);
-static void utc_appsvc_set_pkgname_func_02(void);
-static void utc_appsvc_set_pkgname_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_set_pkgname_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_set_pkgname_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_set_pkgname_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_pkgname starts");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_pkgname ends");
-}
-
-/**
- * @brief Positive test case of appsvc_set_pkgname()
- */
-static void utc_appsvc_set_pkgname_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_pkgname(b, "org.tizen.test");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_set_pkgname test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_pkgname test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_pkgname()
- */
-static void utc_appsvc_set_pkgname_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_pkgname(b, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_pkgname test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_pkgname test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_pkgname()
- */
-static void utc_appsvc_set_pkgname_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_set_pkgname(NULL, "org.tizen.test");
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_pkgname test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_pkgname test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_set_uri_func.c b/TC/unit/utc_ApplicationFW_appsvc_set_uri_func.c
deleted file mode 100644
index 4adc1ae..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_set_uri_func.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_set_uri_func_01(void);
-static void utc_appsvc_set_uri_func_02(void);
-static void utc_appsvc_set_uri_func_03(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_set_uri_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_set_uri_func_02, NEGATIVE_TC_IDX},
-	{utc_appsvc_set_uri_func_03, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri start");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_set_uri ends ");
-
-}
-
-/**
- * @brief Positive test case of appsvc_set_uri()
- */
-static void utc_appsvc_set_uri_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_uri(b, "http://www.samsung.com");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_set_uri test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_uri test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_uri()
- */
-static void utc_appsvc_set_uri_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	bundle *b = NULL;
-	b = bundle_create();
-	if (b == NULL) {
-		tet_infoline("Test initialization failed!!!");
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-	ret = appsvc_set_uri(b, NULL);
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_uri test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_uri test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	bundle_free(b);
-	return;
-}
-
-/**
- * @brief Negative test case of appsvc_set_uri()
- */
-static void utc_appsvc_set_uri_func_03(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_set_uri(NULL, "http://www.samsung.com");
-	if (ret == APPSVC_RET_EINVAL) {
-		tet_infoline("appsvc_set_uri test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_set_uri test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-	return;
-}
diff --git a/TC/unit/utc_ApplicationFW_appsvc_unset_defapp_func.c b/TC/unit/utc_ApplicationFW_appsvc_unset_defapp_func.c
deleted file mode 100755
index 6e20043..0000000
--- a/TC/unit/utc_ApplicationFW_appsvc_unset_defapp_func.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  app-svc
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <tet_api.h>
-#include <appsvc.h>
-#include <bundle.h>
-#include <unistd.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup) (void) = startup;
-void (*tet_cleanup) (void) = cleanup;
-
-static void utc_appsvc_unset_defapp_func_01(void);
-static void utc_appsvc_unset_defapp_func_02(void);
-
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{utc_appsvc_unset_defapp_func_01, POSITIVE_TC_IDX},
-	{utc_appsvc_unset_defapp_func_02, NEGATIVE_TC_IDX},
-	{NULL, 0}
-};
-
-static void startup(void)
-{
-	tet_infoline("Testing API appsvc_unset_defapp starts");
-	appsvc_unset_defapp("org.tizen.xyz");
-}
-
-static void cleanup(void)
-{
-	tet_infoline("Testing API appsvc_unset_defapp ends");
-	appsvc_unset_defapp("org.tizen.xyz");
-}
-
-/**
- * @brief Positive test case of appsvc_unset_defapp()
- */
-static void utc_appsvc_unset_defapp_func_01(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret =
-	    appsvc_set_defapp("http://tizen.org/appsvc/operation/xyz", NULL, NULL,
-			      "org.tizen.xyz");
-	if (ret != APPSVC_RET_OK) {
-		tet_result(TET_UNINITIATED);
-		return;
-	}
-
-	ret = appsvc_unset_defapp("org.tizen.xyz");
-	if (ret == APPSVC_RET_OK) {
-		tet_infoline("appsvc_unset_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_unset_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
-
-/**
- * @brief Negative test case of appsvc_unset_defapp()
- */
-static void utc_appsvc_unset_defapp_func_02(void)
-{
-	int ret = APPSVC_RET_OK;
-	ret = appsvc_unset_defapp(NULL);
-	if (ret < 0) {
-		tet_infoline("appsvc_unset_defapp test PASS!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_PASS);
-	} else {
-		tet_infoline("appsvc_unset_defapp test FAIL!");
-		tet_printf("ret = %d", ret);
-		tet_result(TET_FAIL);
-	}
-}
diff --git a/TC/unit/utc_MODULE_API_func.c.in b/TC/unit/utc_MODULE_API_func.c.in
deleted file mode 100644
index 9630027..0000000
--- a/TC/unit/utc_MODULE_API_func.c.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <tet_api.h>
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_@MODULE@_@API@_func_01(void);
-static void utc_@MODULE@_@API@_func_02(void);
-
-enum {
-	POSITIVE_TC_IDX = 0x01,
-	NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-	{ utc_@MODULE@_@API@_func_01, POSITIVE_TC_IDX },
-	{ utc_@MODULE@_@API@_func_02, NEGATIVE_TC_IDX },
-	{ NULL, 0 }
-};
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of @API@()
- */
-static void utc_@MODULE@_@API@_func_01(void)
-{
-	int r = 0;
-
-/*
-	r = @API@(...);
-*/
-	if (r) {
-		tet_infoline("@API@() failed in positive test case");
-		tet_result(TET_FAIL);
-		return;
-	}
-	tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init @API@()
- */
-static void utc_@MODULE@_@API@_func_02(void)
-{
-	int r = 0;
-
-/*
-	r = @API@(...);
-*/
-	if (r) {
-		tet_infoline("@API@() failed in negative test case");
-		tet_result(TET_FAIL);
-		return;
-	}
-	tet_result(TET_PASS);
-}
diff --git a/debian/changelog b/debian/changelog
index a498f0f..41f3fc5 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,230 @@
+app-svc (0.1.25) unstable; urgency=low
+
+  * changed to use the application ID
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.25
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 05 Jun 2012 20:46:18 +0900
+
+app-svc (0.1.24) unstable; urgency=low
+
+  * added new API for transient window
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.24
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 04 Jun 2012 20:00:10 +0900
+
+app-svc (0.1.23) unstable; urgency=low
+
+  * Added error handle for uri
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.23
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 18 May 2012 11:15:05 +0900
+
+app-svc (0.1.22) unstable; urgency=low
+
+  * Updated uri resolution
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.22
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 03 Apr 2012 17:59:06 +0900
+
 app-svc (0.1.21) unstable; urgency=low
 
-  * Initial release
-  * Git: pkgs/a/app-svc
+  * Fixed compile warnings
+  * Git: slp/pkgs/a/app-svc
   * Tag: app-svc_0.1.21
 
  -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 20 Mar 2012 14:11:59 +0900
+
+app-svc (0.1.20) unstable; urgency=low
+
+  * Changed operation and extra data format
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.20
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 15 Mar 2012 17:18:15 +0900
+
+app-svc (0.1.19) unstable; urgency=low
+
+  * Added TC
+  * Git: slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.19
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 19 Dec 2011 14:30:00 +0900
+
+app-svc (0.1.18) unstable; urgency=low
+
+  * Fix appsvc_set_defapp bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.18
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 14 Dec 2011 14:53:09 +0900
+
+app-svc (0.1.17) unstable; urgency=low
+
+  * Changed boilerplate
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.17
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 05 Dec 2011 16:45:29 +0900
+
+app-svc (0.1.16) unstable; urgency=low
+
+  * Fix appsvc_test bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.16
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 14 Nov 2011 19:52:07 +0900
+
+app-svc (0.1.15) unstable; urgency=low
+
+  * Changed Boilerplate as per the guideline
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.15 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 07 Nov 2011 17:36:50 +0900
+
+app-svc (0.1.14) unstable; urgency=low
+
+  * Fix prevent defects
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.14 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 25 Oct 2011 20:39:26 +0900
+
+app-svc (0.1.13) unstable; urgency=low
+
+  * modify protype of appsvc_set_defapp
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.13 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 15 Oct 2011 19:42:04 +0900
+
+app-svc (0.1.12) unstable; urgency=low
+
+  * Support array
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.12
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 06 Oct 2011 22:01:02 +0900
+
+app-svc (0.1.11) unstable; urgency=low
+
+  * About explicit svc
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.11 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 21 Sep 2011 21:08:11 +0900
+
+app-svc (0.1.10) unstable; urgency=low
+
+  * Fix bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.10 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 17 Sep 2011 18:39:01 +0900
+
+app-svc (0.1.9) unstable; urgency=low
+
+  * changelog
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.9 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 05 Sep 2011 21:00:46 +0900
+
+app-svc (0.1.8) unstable; urgency=low
+
+  * Fix prevent defects
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.8 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 05 Sep 2011 13:46:19 +0900
+
+app-svc (0.1.7) unstable; urgency=low
+
+  * Fix bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.7 
+
+ -- Jaeho81.lee <jaeho81.lee@samsung.com>  Wed, 31 Aug 2011 16:32:47 +0900
+
+app-svc (0.1.6) unstable; urgency=low
+
+  * Add appsvc_is_defapp API
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.6 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 25 Aug 2011 20:55:10 +0900
+
+app-svc (0.1.5) unstable; urgency=low
+
+  * Add appsvc_unset_defapp API
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.5 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 25 Aug 2011 09:57:36 +0900
+
+app-svc (0.1.4) unstable; urgency=low
+
+  * Fix prevnet defects
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.4 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 20 Aug 2011 18:07:30 +0900
+
+app-svc (0.1.3) unstable; urgency=low
+
+  * Fix bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.3 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 19 Aug 2011 16:09:27 +0900
+
+app-svc (0.1.2) unstable; urgency=low
+
+  * Modify comments for build warning
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.2 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 13 Aug 2011 18:23:56 +0900
+
+app-svc (0.1.1) unstable; urgency=low
+
+  * Fix bug
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.1 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 11 Aug 2011 13:18:30 +0900
+
+app-svc (0.1.0-2) unstable; urgency=low
+
+  * Apply appsvc code
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.0-2 
+
+ -- Sewook Park <sewook7.park@samsung.com>  Wed, 10 Aug 2011 21:36:09 +0900
+
+app-svc (0.1.0-1) unstable; urgency=low
+
+  * Apply appsvc code
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.0-1
+
+ -- Sewook Park <sewook7.park@samsung.com>  Wed, 10 Aug 2011 20:54:10 +0900
+
+app-svc (0.1.0) unstable; urgency=low
+
+  * Apply appsvc code
+  * Git: 165.213.180.234:slp/pkgs/a/app-svc
+  * Tag: app-svc_0.1.0
+
+ -- Sewook ParK <sewook7.park@samsung.com>  Wed, 10 Aug 2011 18:48:45 +0900
+
+app-svc (0.0.1) unstable; urgency=low
+
+  * initial update
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 19 Jul 2011 10:23:24 +0900
+
diff --git a/debian/control b/debian/control
index 99abe21..b009b84 100755
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: app-svc
 Section: devel
 Priority: extra
 Maintainer: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
-Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libsqlite3-dev, libx11-dev, libecore-dev, libbundle-dev, libail-0-dev, dlog-dev, libxdgmime-dev, libprivilege-control-dev, sqlite3, libaul-1-dev
+Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libsqlite3-dev, libx11-dev, libecore-dev, libbundle-dev, libail-0-dev, dlog-dev, libxdgmime-dev, libprivilege-control-dev, sqlite3, libaul-1-dev, libecore-dev, libsoup2.4-dev
 Standards-Version: 0.1.0 
 
 Package: libappsvc-dev
diff --git a/include/appsvc.h b/include/appsvc.h
index 8cc03fb..789c139 100755
--- a/include/appsvc.h
+++ b/include/appsvc.h
@@ -94,6 +94,14 @@ extern "C" {
 /** APP_SVC DATA TYPE*/
 #define APPSVC_DATA_KEYWORD		"http://tizen.org/appsvc/data/keyword"
 
+/** APP SVC internal private key */
+#define APP_SVC_K_URI_R_INFO		"__APP_SVC_URI_R_INFO__"
+
+/** APP SVC internal private value */
+#define APP_SVC_V_SCHEME_AND_HOST		"__SCHEME_AND_HOST__"
+/** APP SVC internal private value */
+#define APP_SVC_V_SCHEME		"__SCHEME__"
+
 
 /**
  * @brief Return values in appsvc. 
@@ -134,6 +142,7 @@ typedef void (*appsvc_res_fn)(bundle *b, int request_code, appsvc_result_val res
 */
 typedef int (*appsvc_info_iter_fn)(const char *pkg_name, void *data);
 
+typedef int (*appsvc_host_res_fn)(void *data);
 
 /**
  * @par Description:
@@ -344,6 +353,44 @@ int appsvc_add_data_array(bundle *b, const char *key, const char **val_array, in
  */
 int appsvc_set_pkgname(bundle *b, const char *pkg_name);
 
+
+/**
+ * @par Description:
+ * This function sets a appid to launch application based on appsvc.
+ *
+ * @param[in] b bundle object
+ * @param[in] appid application id for explict launch
+ *
+ * @return 0 if success, negative value(<0) if fail
+ * @retval APPSVC_RET_OK - success
+ * @retval APPSVC_RET_ERROR - general error
+ * @retval APPSVC_RET_EINVAL - invalid argument(content)
+ *
+ * @pre None.
+ * @post None.
+ * @see None.
+ * @remarks None.
+ *
+ * @par Sample code:
+ * @code
+#include <appsvc.h>
+
+...
+{
+	bundle *b = NULL;
+
+	b = bundle_create();
+
+	appsvc_set_operation(b, APPSVC_OPERATION_PICK);
+	appsvc_set_mime(b,"image/jpg");
+	appsvc_set_appid(b, "org.tizen.mygallery");
+}
+ * @endcode
+ *
+ */
+int appsvc_set_appid(bundle *b, const char *appid);
+
+
 /**
  * @par Description:
  * This API launch application based on appsvc.
@@ -543,6 +590,33 @@ const char *appsvc_get_pkgname(bundle *b);
 
 /**
  * @par Description:
+ * This function gets a application id from bundle.
+ *
+ * @param[in] b bundle object
+ *
+ * @return Pointer for application id string if success, NULL if fail
+ *
+ * @pre None.
+ * @post None.
+ * @see None.
+ * @remarks None.
+ *
+ * @par Sample code:
+ * @code
+#include <appsvc.h>
+
+...
+{
+	char *val;
+	val = appsvc_get_appid(b);
+}
+ * @endcode
+ *
+ */
+const char *appsvc_get_appid(bundle *b);
+
+/**
+ * @par Description:
  * This function gets value from key.
  *
  * @param[in] b bundle object 
@@ -701,7 +775,8 @@ int appsvc_send_result(bundle *b, appsvc_result_val result);
  * @endcode
  *
  */
-int appsvc_set_defapp(const char *op,const char *mime_type,const char *scheme,const char *defapp);
+int appsvc_set_defapp(const char *op, const char *mime_type, const char *uri,
+				const char *defapp);
 
 /**
  * @par Description:
diff --git a/include/internal.h b/include/internal.h
index 0e42b81..5b9231b 100755
--- a/include/internal.h
+++ b/include/internal.h
@@ -35,6 +35,7 @@
 #define MAX_URI_STR_SIZE 256
 #define MAX_MIME_STR_SIZE 256
 #define MAX_SCHEME_STR_SIZE 256
+#define MAX_HOST_STR_SIZE 256
 #define MAX_OP_STR_SIZE 128
 #define MAX_LOCAL_BUFSZ 128
 
diff --git a/include/priv_key.h b/include/priv_key.h
index daac8a7..1279448 100755
--- a/include/priv_key.h
+++ b/include/priv_key.h
@@ -37,6 +37,9 @@
 /** APP SVC internal private key */
 #define APP_SVC_K_RES_VAL	"__APP_SVC_K_RES_VAL__"
 
+/** APP SVC internal private key */
+#define APP_SVC_K_WIN_ID	"__APP_SVC_K_WIN_ID__"
+
 
 #endif		/* __PRIV_KEY_H__ */
 
diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec
index 96d3a62..1dbae67 100644
--- a/packaging/app-svc.spec
+++ b/packaging/app-svc.spec
@@ -1,7 +1,8 @@
+#sbs-git:slp/pkgs/a/app-svc app-svc 0.1.19 de68cdc468eaded317b4f5be9cdafebb01639aa0
 Name:	    app-svc
 Summary:    App svc
-Version: 0.1.21
-Release:    2
+Version: 0.1.26
+Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -22,6 +23,7 @@ BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(xdgmime)
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libsoup-2.4)
 
 
 %description
diff --git a/src/appsvc.c b/src/appsvc.c
index 432f250..f76f38f 100755
--- a/src/appsvc.c
+++ b/src/appsvc.c
@@ -27,6 +27,9 @@
 
 #include <ail.h>
 #include <aul.h>
+#include <libsoup/soup.h>
+#include <Ecore_X.h>
+#include <Ecore.h>
 
 #include "appsvc.h"
 #include "appsvc_db.h"
@@ -55,6 +58,8 @@ typedef struct _appsvc_resolve_info_t{
 	char *op;
 	char *uri;
 	char *scheme;
+	char *host;
+	char *uri_r_info;
 	char *origin_mime;
 	char *mime;	
 	char *m_type;
@@ -71,14 +76,13 @@ static appsvc_cb_info_t *__create_rescb(int request_code, appsvc_res_fn cbfunc,
 static void __remove_rescb(appsvc_cb_info_t *info);
 static int __set_bundle(bundle *b, const char *key, const char *value);
 static void __aul_cb(bundle *b, int is_cancel, void *data);
-static int __svc_iter_func(const char* pkg_name, void *data);
 static int __run_svc_with_pkgname(char *pkgname, bundle *b, int request_code,
 				  appsvc_res_fn cbfunc, void *data);
 static int __get_resolve_info(bundle *b, appsvc_resolve_info_t *info);
 static int __free_resolve_info_data(appsvc_resolve_info_t *info);
 static ail_cb_ret_e __ail_iter_func(const ail_appinfo_h appinfo,
 				    void *user_data);
-static int __get_list_with_condition(char *op, char *scheme, 
+static int __get_list_with_condition(char *op, char *uri,
 				     char *mime, GSList **pkg_list);
 
 
@@ -179,18 +183,6 @@ static void __aul_cb(bundle *b, int is_cancel, void *data)
 	return;
 }
 
-static int __svc_iter_func(const char* pkg_name, void *data)
-{
-	GSList **pkg_list = (GSList **)data;
-	char *pkgname = NULL;
-
-	pkgname = strdup(pkg_name);
-
-	*pkg_list = g_slist_append(*pkg_list, pkgname);
-
-	return 0;
-}
-
 static int __run_svc_with_pkgname(char *pkgname, bundle *b, int request_code, appsvc_res_fn cbfunc, void *data)
 {
 	appsvc_cb_info_t *cb_info = NULL;
@@ -216,8 +208,8 @@ static int __run_svc_with_pkgname(char *pkgname, bundle *b, int request_code, ap
 static int __get_resolve_info(bundle *b, appsvc_resolve_info_t *info)
 {
 	char *tmp = NULL;
-	char *tmp2 = NULL;
 	char *strtok_buf = NULL;
+	SoupURI *s_uri;
 	
 	info->op = (char *)appsvc_get_operation(b);
 	info->uri = (char *)appsvc_get_uri(b);
@@ -250,12 +242,26 @@ static int __get_resolve_info(bundle *b, appsvc_resolve_info_t *info)
 	}
 
 	if(info->uri) {
-		info->scheme = malloc(MAX_SCHEME_STR_SIZE);
-		tmp = strdup(info->uri);
-		tmp2 = strtok(tmp,":");
-		if(tmp2)
-			strncpy(info->scheme, tmp2, MAX_SCHEME_STR_SIZE-1);
-		free(tmp);
+		s_uri = soup_uri_new(info->uri);
+
+		if(!s_uri)
+			return APPSVC_RET_EINVAL;
+
+		if(s_uri->scheme) {
+			info->scheme = malloc(MAX_SCHEME_STR_SIZE);
+			strncpy(info->scheme, s_uri->scheme, MAX_SCHEME_STR_SIZE-1);
+		}
+		if(s_uri->host) {
+			info->host = malloc(MAX_HOST_STR_SIZE);
+			strncpy(info->host, s_uri->host, MAX_HOST_STR_SIZE-1);
+		}
+		if(info->scheme && info->host) {
+			info->uri_r_info = malloc(MAX_SCHEME_STR_SIZE+MAX_HOST_STR_SIZE+2);
+			snprintf(info->uri_r_info, MAX_SCHEME_STR_SIZE+MAX_HOST_STR_SIZE+1,
+				"%s://%s", info->scheme, info->host);
+		}
+
+		soup_uri_free(s_uri);
 	} else {
 		info->scheme = strdup("NULL");
 	}
@@ -281,7 +287,8 @@ static int __get_resolve_info(bundle *b, appsvc_resolve_info_t *info)
 			strncpy(info->s_type, "%", MAX_LOCAL_BUFSZ-1);	
 		}
 
-		if(!info->mime_set) info->mime = malloc(MAX_MIME_STR_SIZE);
+		if(!info->mime_set)
+			info->mime = malloc(MAX_MIME_STR_SIZE);
 		snprintf(info->mime, MAX_MIME_STR_SIZE-1, "%s/%s", info->m_type, info->s_type);
 	}
 
@@ -294,10 +301,14 @@ static int __free_resolve_info_data(appsvc_resolve_info_t *info)
 		free(info->mime);
 	if (info->scheme) 
 		free(info->scheme);
+	if (info->host)
+		free(info->host);
 	if (info->m_type)
 		free(info->m_type);
 	if (info->s_type)
 		free(info->s_type);
+	if (info->uri_r_info)
+		free(info->uri_r_info);
 	
 	return 0;
 }
@@ -327,7 +338,7 @@ static ail_cb_ret_e __ail_iter_func(
 	return AIL_CB_RET_CONTINUE;
 }
 
-static int __get_list_with_condition(char *op, char *scheme, char *mime, GSList **pkg_list)
+static int __get_list_with_condition(char *op, char *uri, char *mime, GSList **pkg_list)
 {
 	ail_filter_h filter;
 	ail_error_e ail_ret;
@@ -337,7 +348,7 @@ static int __get_list_with_condition(char *op, char *scheme, char *mime, GSList
 	if (ail_ret != AIL_ERROR_OK) 
 		return APPSVC_RET_ERROR;
 
-	snprintf(svc_filter, MAX_FILTER_STR_SIZE-1, "%s|%s|%s", op, scheme, mime);
+	snprintf(svc_filter, MAX_FILTER_STR_SIZE-1, "%s|%s|%s", op, uri, mime);
 	_D("svc_filter : %s",svc_filter);
 
 	ail_ret = ail_filter_add_str(filter, AIL_PROP_X_SLP_SVC_STR, svc_filter);
@@ -418,6 +429,40 @@ SLPAPI int appsvc_set_pkgname(bundle *b, const char *pkg_name)
 	return __set_bundle(b, APP_SVC_K_PKG_NAME, pkg_name);
 }
 
+SLPAPI int appsvc_set_appid(bundle *b, const char *appid)
+{
+	if(b == NULL){
+		_E("bundle for appsvc_set_appid is NULL");
+		return APPSVC_RET_EINVAL;
+	}
+
+	return __set_bundle(b, APP_SVC_K_PKG_NAME, appid);
+}
+
+static int __get_list_with_condition_mime_extened(char *op, char *uri, char *mime,
+	char *m_type, char *s_type, GSList **pkg_list)
+{
+	char *tmp;
+
+	tmp = malloc(MAX_MIME_STR_SIZE);
+
+	__get_list_with_condition(op, uri, mime, pkg_list);
+
+	if ((strncmp(mime, "NULL", 4) != 0) && (strncmp(s_type, "%", 1) != 0)) {
+		snprintf(tmp, MAX_MIME_STR_SIZE-1, "%s/*", m_type);
+		__get_list_with_condition(op, uri, tmp, pkg_list);
+	}
+
+	if ((strncmp(mime, "NULL", 4) != 0) && (strncmp(m_type, "%", 1) != 0)) {
+		snprintf(tmp, MAX_MIME_STR_SIZE-1, "*/*");
+		__get_list_with_condition(op, uri, tmp, pkg_list);
+	}
+
+	free(tmp);
+
+	return 0;
+}
+
 SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc, void *data)
 {
 	appsvc_resolve_info_t info;
@@ -430,12 +475,14 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
 	char *list_item;
 
 	if(b == NULL){
-		_E("bundle for appsvc_set_pkgname is NULL");
+		_E("bundle for appsvc_set_appid is NULL");
 		return APPSVC_RET_EINVAL;
 	}
 
 	memset(&info, 0, sizeof(appsvc_resolve_info_t));
-	__get_resolve_info(b, &info);
+	ret = __get_resolve_info(b, &info);
+	if(ret < 0)
+		return ret;
 
 	pkgname = info.pkgname;
 	_D("op - %s / mime - %s / shceme - %s\n", info.op, info.mime, info.scheme);
@@ -445,27 +492,65 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
 		if(appsvc_get_operation(b) == NULL)
 			appsvc_set_operation(b,APPSVC_OPERATION_DEFAULT);
 		ret = __run_svc_with_pkgname(pkgname, b, request_code, cbfunc, data);
-		if (info.mime_set) appsvc_set_mime(b,NULL);
 		__free_resolve_info_data(&info);
 		return ret;
 	}
+
+	if(info.uri_r_info) {
+		pkgname = _svc_db_get_app(info.op, info.mime, info.uri_r_info);
+
+		if(pkgname==NULL){
+			__get_list_with_condition_mime_extened(info.op, info.uri_r_info,
+				info.mime, info.m_type, info.s_type, &pkg_list);
+			pkg_count = g_slist_length(pkg_list);
+			if(pkg_count > 0) {
+				__get_list_with_condition_mime_extened(info.op, info.scheme,
+					info.mime, info.m_type, info.s_type, &pkg_list);
+
+				pkg_count = g_slist_length(pkg_list);
+
+				if(pkg_count == 1){
+					pkgname = (char *)pkg_list->data;
+					if(pkgname != NULL){
+						ret = __run_svc_with_pkgname(pkgname, b, request_code, cbfunc, data);
+						goto end;
+					}
+				} else {
+					bundle_add(b, APP_SVC_K_URI_R_INFO, APP_SVC_V_SCHEME_AND_HOST);
+					ret = __run_svc_with_pkgname(APP_SELECTOR, b, request_code, cbfunc, data);
+					goto end;
+				}
+			}
+			for (iter = pkg_list; iter != NULL; iter = g_slist_next(iter)) {
+				list_item = (char *)iter->data;
+				g_free(list_item);
+			}
+			g_slist_free(pkg_list);
+			pkg_list = NULL;
+		}  else {
+			ret = __run_svc_with_pkgname(pkgname, b, request_code, cbfunc, data);
+			free(pkgname);
+			goto end;
+		}
+	}
 	
-	pkgname = _svc_db_get_app(info.op, info.origin_mime, info.scheme);
+	pkgname = _svc_db_get_app(info.op, info.mime, info.scheme);
 
 	if(pkgname==NULL){
-		appsvc_get_list(b, __svc_iter_func, (void *)&pkg_list);
-		
+		__get_list_with_condition_mime_extened(info.op, info.scheme,
+			info.mime, info.m_type, info.s_type, &pkg_list);
 		pkg_count = g_slist_length(pkg_list);
+
 		if(pkg_count == 1){
 			pkgname = (char *)pkg_list->data;
 			if(pkgname != NULL){
 				ret = __run_svc_with_pkgname(pkgname, b, request_code, cbfunc, data);
 			}
-		}
-		else if(pkg_count < 1){
-			if (info.mime_set) appsvc_set_mime(b,NULL);
+		} else if(pkg_count < 1) {
+			__free_resolve_info_data(&info);
 			return APPSVC_RET_ENOMATCH;
 		} else {
+			bundle_add(b, APP_SVC_K_URI_R_INFO, APP_SVC_V_SCHEME);
 			ret = __run_svc_with_pkgname(APP_SELECTOR, b, request_code, cbfunc, data);
 		}
 
@@ -476,10 +561,12 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
 		g_slist_free(pkg_list);	
 	} else {
 		ret = __run_svc_with_pkgname(pkgname, b, request_code, cbfunc, data);
+		free(pkgname);
 	}
-	if (info.mime_set) appsvc_set_mime(b,NULL);
 
+end:
 	__free_resolve_info_data(&info);
+
 	return ret;
 }
 
@@ -488,6 +575,7 @@ SLPAPI int appsvc_get_list(bundle *b, appsvc_info_iter_fn iter_fn, void *data)
 	appsvc_resolve_info_t info;
 	char *pkgname = NULL;
 	int pkg_count;
+	int ret = -1;
 
 	GSList *pkg_list = NULL;
 	GSList *iter = NULL;
@@ -504,20 +592,19 @@ SLPAPI int appsvc_get_list(bundle *b, appsvc_info_iter_fn iter_fn, void *data)
 	
 	/* parse bundle */
 	memset(&info, 0, sizeof(appsvc_resolve_info_t));
-	__get_resolve_info(b,&info);
+	ret = __get_resolve_info(b,&info);
+	if(ret < 0)
+		return ret;
 	
 	_D("operation - %s / shceme - %s / mime - %s\n", info.op, info.scheme, info.mime);
-	__get_list_with_condition(info.op, info.scheme,info.mime, &pkg_list);
 
-	if ((strncmp(info.mime, "NULL", 4) != 0) && (strncmp(info.s_type, "%", 1) != 0)) {
-		snprintf(info.mime, MAX_MIME_STR_SIZE-1, "%s/*", info.m_type);
-		__get_list_with_condition(info.op, info.scheme, info.mime, &pkg_list);
-	}
-
-	if ((strncmp(info.mime, "NULL", 4) != 0) && (strncmp(info.m_type, "%", 1) != 0)) {
-		snprintf(info.mime, MAX_MIME_STR_SIZE-1, "*/*");
-		__get_list_with_condition(info.op, info.scheme, info.mime, &pkg_list);
+	if(info.uri_r_info) {
+		__get_list_with_condition_mime_extened(info.op, info.uri_r_info, 
+			info.mime, info.m_type, info.s_type, &pkg_list);
 	}
+	
+	__get_list_with_condition_mime_extened(info.op, info.scheme, 
+		info.mime, info.m_type, info.s_type, &pkg_list);
 
 	pkg_count = g_slist_length(pkg_list);
 	if (pkg_count == 0) {
@@ -569,6 +656,11 @@ SLPAPI const char *appsvc_get_pkgname(bundle *b)
 	return bundle_get_val(b, APP_SVC_K_PKG_NAME);
 }
 
+SLPAPI const char *appsvc_get_appid(bundle *b)
+{
+	return bundle_get_val(b, APP_SVC_K_PKG_NAME);
+}
+
 SLPAPI int appsvc_create_result_bundle(bundle *inb, bundle **outb)
 {
 	int ret = -1;
@@ -622,14 +714,15 @@ SLPAPI int appsvc_send_result(bundle *b, appsvc_result_val result)
 	return ret;
 } 
 
-SLPAPI int appsvc_set_defapp(const char *op,const char *mime_type,const char *scheme,const char *defapp)
+SLPAPI int appsvc_set_defapp(const char *op, const char *mime_type, const char *uri,
+					const char *defapp)
 {
 	int ret;
 
 	if(op == NULL || defapp == NULL)
 		return APPSVC_RET_EINVAL;
 
-	ret = _svc_db_add_app(op,mime_type,scheme,defapp);
+	ret = _svc_db_add_app(op, mime_type, uri, defapp);
 
 	if(ret < 0)
 		return APPSVC_RET_ERROR;
@@ -670,4 +763,69 @@ SLPAPI int appsvc_data_is_array(bundle *b, const char *key)
 	return 0;
 }
 
+typedef struct _appsvc_transient_cb_info_t{
+	appsvc_host_res_fn cb_func;
+	Ecore_X_Window win_id;
+	void *data;
+}appsvc_transient_cb_info_t;
+
+static Eina_Bool __transient_cb(void *data, int type, void *event)
+{
+	Ecore_X_Event_Window_Hide *ev;
+	appsvc_transient_cb_info_t*  cb_info;
+
+	ev = event;
+	cb_info = (appsvc_transient_cb_info_t*) data;
+
+	if(ev->win == cb_info->win_id) {
+		cb_info->cb_func(cb_info->data);
+		ecore_main_loop_quit();
+	}
+
+	return ECORE_CALLBACK_RENEW;
+}
+
+SLPAPI int appsvc_allow_transient_app(bundle *b, Ecore_X_Window id)
+{
+	char win_id[MAX_LOCAL_BUFSZ];
+
+	snprintf(win_id, MAX_LOCAL_BUFSZ, "%d", id);
+
+	if(b == NULL){
+		_E("bundle for appsvc_allow_transient_app is NULL");
+		return APPSVC_RET_EINVAL;
+	}
+
+	return __set_bundle(b, APP_SVC_K_WIN_ID, win_id);
+}
+
+SLPAPI int appsvc_request_transient_app(bundle *b, Ecore_X_Window callee_id, appsvc_host_res_fn cbfunc, void *data)
+{
+	char *caller = NULL;
+	Ecore_X_Window caller_id;
+
+	caller = bundle_get_val(b, APP_SVC_K_WIN_ID);
+	if(caller == NULL)
+		return APPSVC_RET_ERROR;
+
+	caller_id = atoi(caller);
+
+	ecore_x_icccm_transient_for_set(callee_id, caller_id);
+
+	ecore_x_window_client_manage(caller_id);
+
+	appsvc_transient_cb_info_t* info;
+
+	info = (appsvc_transient_cb_info_t*)calloc(1, sizeof(appsvc_transient_cb_info_t));
+	if(info == NULL)
+		return APPSVC_RET_ERROR;
+
+	info->win_id = caller_id;
+	info->cb_func = cbfunc;
+	info->data = data;
+
+	ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, __transient_cb, info);
+
+	return 0;
+}
 
diff --git a/test/appsvc_test.c b/test/appsvc_test.c
index 7f8733f..30a4eff 100755
--- a/test/appsvc_test.c
+++ b/test/appsvc_test.c
@@ -103,7 +103,7 @@ void __set_bundle_from_args(bundle * kb)
 		free(uri);
 	}
 	if(package) {
-		appsvc_set_pkgname(kb,package);
+		appsvc_set_appid(kb,package);
 		free(package);
 	}
 }