mv dmsfwk

Signed-off-by: ql <qianli16@huawei.com>
Change-Id: I6e7d9a05932b75fb8f05dd6d646ba8995ee4313e
This commit is contained in:
ql
2022-07-19 15:57:56 +08:00
parent f26b052046
commit 9b18628859
18 changed files with 105 additions and 107 deletions
+3 -3
View File
@@ -18,7 +18,7 @@ Distributed Scheduler is used for cross-device component management. It allows t
## Directory Structure<a name="section161941989596"></a>
```
/foundation/distributedschedule
/foundation/ability
├── dmsfwk # DMS framework (DMS is short for Distributed Manager Service, also called the Distributed Scheduler Service)
├── dms_fwk_lite # Lightweight DMS framework
```
@@ -27,6 +27,6 @@ Distributed Scheduler is used for cross-device component management. It allows t
**Distributed Scheduler**
distributedschedule\_dms\_fwk
ability\_dms\_fwk
distributedschedule\_dms\_fwk\_lite
ability\_dms\_fwk\_lite
+3 -3
View File
@@ -26,7 +26,7 @@
## 目录<a name="section161941989596"></a>
```
/foundation/distributedschedule
/foundation/ability
├── dmsfwk # 分布式组件管理部件模块
├── dms_fwk_lite # 轻量分布式组件管理部件模块
```
@@ -35,6 +35,6 @@
**分布式组件管理部件**
distributedschedule\_dms\_fwk
ability\_dms\_fwk
distributedschedule\_dms\_fwk\_lite
ability\_dms\_fwk\_lite
+19 -19
View File
@@ -6,20 +6,20 @@
"repository": "https://gitee.com/openharmony/distributedschedule_dms_fwk",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/distributedschedule/dmsfwk"
"destPath": "foundation/ability/dmsfwk"
},
"dirs": {},
"scripts": {},
"license": "Apache License 2.0",
"component": {
"name": "dmsfwk_standard",
"subsystem": "distributedschedule",
"name": "dmsfwk",
"subsystem": "ability",
"adapted_system_type": [ "standard" ],
"features" : [
"dmsfwk_standard_mission_manager"
"dmsfwk_mission_manager"
],
"hisysevent_config": [
"//foundation/distributedschedule/dmsfwk/hisysevent.yaml"
"//foundation/ability/dmsfwk/hisysevent.yaml"
],
"rom": "",
"ram": "",
@@ -49,19 +49,19 @@
},
"build": {
"sub_component": [
"//foundation/distributedschedule/dmsfwk/etc/init:etc",
"//foundation/distributedschedule/dmsfwk/etc/param:param_files",
"//foundation/distributedschedule/dmsfwk/etc/profile:distributedsched_trust",
"//foundation/distributedschedule/dmsfwk/interfaces/kits/napi:napi_packages",
"//foundation/distributedschedule/dmsfwk/sa_profile:dms_sa_profile",
"//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr:distributed_ability_manager_svr",
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr"
"//foundation/ability/dmsfwk/etc/init:etc",
"//foundation/ability/dmsfwk/etc/param:param_files",
"//foundation/ability/dmsfwk/etc/profile:distributedsched_trust",
"//foundation/ability/dmsfwk/interfaces/kits/napi:napi_packages",
"//foundation/ability/dmsfwk/sa_profile:dms_sa_profile",
"//foundation/ability/dmsfwk/services/base:dmsbaseinner",
"//foundation/ability/dmsfwk/services/dtbabilitymgr:distributed_ability_manager_svr",
"//foundation/ability/dmsfwk/services/dtbschedmgr:distributedschedsvr"
],
"inner_kits": [
{
"header": {
"header_base": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager/include",
"header_base": "//foundation/ability/dmsfwk/interfaces/innerkits/continuation_manager/include",
"header_files": [
"continuation_extra_params.h",
"continuation_mode.h",
@@ -71,22 +71,22 @@
"idevice_selection_notifier.h"
]
},
"name": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager:continuation_manager"
"name": "//foundation/ability/dmsfwk/interfaces/innerkits/continuation_manager:continuation_manager"
},
{
"header": {
"header_base": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/common/include",
"header_base": "//foundation/ability/dmsfwk/interfaces/innerkits/common/include",
"header_files": [
"distributed_ability_manager_client.h",
"distributed_ability_manager_proxy.h"
]
},
"name": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/common:common_sdk"
"name": "//foundation/ability/dmsfwk/interfaces/innerkits/common:common_sdk"
}
],
"test": [
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:unittest",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr:unittest"
"//foundation/ability/dmsfwk/services/dtbschedmgr:unittest",
"//foundation/ability/dmsfwk/services/dtbabilitymgr:unittest"
]
}
}
+2 -2
View File
@@ -12,9 +12,9 @@
# limitations under the License.
declare_args() {
dmsfwk_standard_mission_manager = true
dmsfwk_mission_manager = true
if (defined(global_parts_info) &&
!defined(global_parts_info.multimedia_multimedia_image_standard)) {
dmsfwk_standard_mission_manager = false
dmsfwk_mission_manager = false
}
}
+2 -2
View File
@@ -22,6 +22,6 @@ group("etc") {
ohos_prebuilt_etc("dms_etc") {
source = "distributedsched.cfg"
relative_install_dir = "init"
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
+4 -4
View File
@@ -26,13 +26,13 @@ group("param_files") {
ohos_prebuilt_para("dms.para") {
source = "dms.para"
module_install_dir = "etc/param"
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
ohos_prebuilt_para("dms.para.dac") {
source = "dms.para.dac"
module_install_dir = "etc/param"
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
+2 -2
View File
@@ -16,6 +16,6 @@ import("//build/ohos.gni")
ohos_prebuilt_etc("distributedsched_trust") {
source = "distributedsched_trust.xml"
module_install_dir = "profile"
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
+8 -8
View File
@@ -17,9 +17,9 @@ config("common_public_config") {
visibility = [ ":*" ]
include_dirs = [
"include/",
"//foundation/distributedschedule/dmsfwk/services/base/include",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/include/",
"//foundation/distributedschedule/dmsfwk/utils/native/include/",
"//foundation/ability/dmsfwk/services/base/include",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/include/",
"//foundation/ability/dmsfwk/utils/native/include/",
]
cflags = []
@@ -30,8 +30,8 @@ config("common_public_config") {
ohos_shared_library("common_sdk") {
sources = [
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/distributed_ability_manager_client.cpp",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/distributed_ability_manager_proxy.cpp",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/src/distributed_ability_manager_client.cpp",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/src/distributed_ability_manager_proxy.cpp",
]
public_configs = [ ":common_public_config" ]
@@ -40,13 +40,13 @@ ohos_shared_library("common_sdk") {
"ability_base:want",
"ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"dmsfwk_standard:continuation_manager",
"dmsfwk:continuation_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
@@ -17,7 +17,7 @@ config("continuation_manager_public_config") {
visibility = [ ":*" ]
include_dirs = [
"include/",
"//foundation/distributedschedule/dmsfwk/services/base/include",
"//foundation/ability/dmsfwk/services/base/include",
]
cflags = []
@@ -28,9 +28,9 @@ config("continuation_manager_public_config") {
ohos_shared_library("continuation_manager") {
sources = [
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_extra_params.cpp",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_result.cpp",
"//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/device_selection_notifier_stub.cpp",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_extra_params.cpp",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_result.cpp",
"//foundation/ability/dmsfwk/services/dtbabilitymgr/src/continuationManager/device_selection_notifier_stub.cpp",
]
public_configs = [ ":continuation_manager_public_config" ]
@@ -41,6 +41,6 @@ ohos_shared_library("continuation_manager") {
"utils_base:utils",
]
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
+1 -1
View File
@@ -16,7 +16,7 @@ import("//build/ohos.gni")
js_declaration("continuation_manager") {
sources = [ "./api" ]
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
ohos_copy("continuation_manager_declaration") {
+1 -1
View File
@@ -14,5 +14,5 @@
import("//build/ohos.gni")
group("napi_packages") {
deps = [ "//foundation/distributedschedule/dmsfwk/interfaces/kits/napi/continuation_manager:continuationmanager_napi" ]
deps = [ "//foundation/ability/dmsfwk/interfaces/kits/napi/continuation_manager:continuationmanager_napi" ]
}
@@ -17,7 +17,7 @@ config("continuationmanager_napi_public_config") {
visibility = [ ":*" ]
include_dirs = [
"include/",
"//foundation/distributedschedule/dmsfwk/services/base/include",
"//foundation/ability/dmsfwk/services/base/include",
]
cflags = []
@@ -41,8 +41,8 @@ ohos_shared_library("continuationmanager_napi") {
"ability_base:want",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"dmsfwk_standard:common_sdk",
"dmsfwk_standard:continuation_manager",
"dmsfwk:common_sdk",
"dmsfwk:continuation_manager",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"napi:ace_napi",
@@ -51,6 +51,6 @@ ohos_shared_library("continuationmanager_napi") {
relative_install_dir = "module/continuation"
subsystem_name = "distributedschedule"
part_name = "dmsfwk_standard"
subsystem_name = "ability"
part_name = "dmsfwk"
}
+1 -1
View File
@@ -15,5 +15,5 @@ import("//build/ohos/sa_profile/sa_profile.gni")
ohos_sa_profile("dms_sa_profile") {
sources = [ "1401.xml" ]
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
+3 -3
View File
@@ -18,7 +18,7 @@ config("distributed_sched_config") {
visibility = [ ":*" ]
include_dirs = [
"include/",
"//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager/include/",
"//foundation/ability/dmsfwk/interfaces/innerkits/continuation_manager/include/",
]
}
@@ -49,6 +49,6 @@ ohos_shared_library("dmsbaseinner") {
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
+5 -6
View File
@@ -24,8 +24,8 @@ config("distributed_ability_manager_config") {
include_dirs = [
"include/",
"../base/include/",
"//foundation/distributedschedule/dmsfwk/interfaces/innerkits/common/include/",
"//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager/include/",
"//foundation/ability/dmsfwk/interfaces/innerkits/common/include/",
"//foundation/ability/dmsfwk/interfaces/innerkits/continuation_manager/include/",
]
}
@@ -59,9 +59,8 @@ ohos_shared_library("distributed_ability_manager_svr") {
"utils_base:utils",
]
deps =
[ "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner" ]
deps = [ "//foundation/ability/dmsfwk/services/base:dmsbaseinner" ]
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
+7 -7
View File
@@ -14,11 +14,11 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import("//build/test.gni")
import("//foundation/distributedschedule/dmsfwk/dmsfwk.gni")
import("//foundation/ability/dmsfwk/dmsfwk.gni")
module_output_path = "dmsfwk_standard/distributed_ability_manager_svr_test"
module_output_path = "dmsfwk/distributed_ability_manager_svr_test"
distributed_service = "//foundation/distributedschedule/dmsfwk/services"
distributed_service = "//foundation/ability/dmsfwk/services"
dtbabilitymgr_configs = [
"${distributed_service}/dtbabilitymgr:distributed_ability_manager_config",
@@ -27,8 +27,8 @@ dtbabilitymgr_configs = [
config("test_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/distributedschedule/dmsfwk/utils/native/include",
"//foundation/distributedschedule/dmsfwk/services/base/include",
"//foundation/ability/dmsfwk/utils/native/include",
"//foundation/ability/dmsfwk/services/base/include",
]
}
@@ -44,7 +44,7 @@ dtbabilitymgr_external_deps = [
]
dtbabilitymgr_public_deps = [
"//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
"//foundation/ability/dmsfwk/services/base:dmsbaseinner",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
"//third_party/libxml2:libxml2",
@@ -76,7 +76,7 @@ ohos_unittest("continuationmanagertest") {
external_deps = dtbabilitymgr_external_deps
public_deps = dtbabilitymgr_public_deps
}
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
group("unittest") {
+7 -8
View File
@@ -13,7 +13,7 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import("//foundation/distributedschedule/dmsfwk/dmsfwk.gni")
import("//foundation/ability/dmsfwk/dmsfwk.gni")
group("unittest") {
testonly = true
@@ -26,7 +26,7 @@ config("distributed_sched_config") {
"include",
"../base/include/",
]
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
defines = [ "SUPPORT_DISTRIBUTED_MISSION_MANAGER" ]
}
}
@@ -65,7 +65,7 @@ ohos_shared_library("distributedschedsvr") {
"bundle_framework:appexecfwk_core",
"device_auth:deviceauth_sdk",
"distributeddatamgr:distributeddata_inner",
"dmsfwk_standard:continuation_manager",
"dmsfwk:continuation_manager",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
"hitrace_native:hitrace_meter",
@@ -79,10 +79,9 @@ ohos_shared_library("distributedschedsvr") {
"utils_base:utils",
]
deps =
[ "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner" ]
deps = [ "//foundation/ability/dmsfwk/services/base:dmsbaseinner" ]
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
defines = [ "SUPPORT_DISTRIBUTED_MISSION_MANAGER" ]
sources += [
"src/mission/distributed_data_change_listener.cpp",
@@ -99,6 +98,6 @@ ohos_shared_library("distributedschedsvr") {
external_deps += [ "multimedia_image_standard:image_native" ]
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
+26 -26
View File
@@ -14,11 +14,11 @@
import("//build/ohos.gni")
import("//build/ohos_var.gni")
import("//build/test.gni")
import("//foundation/distributedschedule/dmsfwk/dmsfwk.gni")
import("//foundation/ability/dmsfwk/dmsfwk.gni")
module_output_path = "dmsfwk_standard/distributedschedsvrtest"
module_output_path = "dmsfwk/distributedschedsvrtest"
distributed_service = "//foundation/distributedschedule/dmsfwk/services"
distributed_service = "//foundation/ability/dmsfwk/services"
dsched_configs =
[ "${distributed_service}/dtbschedmgr:distributed_sched_config" ]
@@ -26,8 +26,8 @@ dsched_configs =
config("test_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/distributedschedule/dmsfwk/utils/native/include",
"//foundation/distributedschedule/dmsfwk/services/base/include",
"//foundation/ability/dmsfwk/utils/native/include",
"//foundation/ability/dmsfwk/services/base/include",
]
}
@@ -39,7 +39,7 @@ dsched_external_deps = [
"bundle_framework:appexecfwk_core",
"device_auth:deviceauth_sdk",
"distributeddatamgr:distributeddata_inner",
"dmsfwk_standard:continuation_manager",
"dmsfwk:continuation_manager",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
"hitrace_native:hitrace_meter",
@@ -53,12 +53,12 @@ dsched_external_deps = [
"utils_base:utils",
]
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
dsched_external_deps += [ "multimedia_image_standard:image_native" ]
}
dsched_public_deps = [
"//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
"//foundation/ability/dmsfwk/services/base:dmsbaseinner",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
"//third_party/libxml2:libxml2",
@@ -85,7 +85,7 @@ dtbschedmgr_sources = [
"${distributed_service}/dtbschedmgr/src/dms_token_callback.cpp",
]
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
dtbschedmgr_sources += [
"${distributed_service}/dtbschedmgr/src/mission/distributed_data_change_listener.cpp",
"${distributed_service}/dtbschedmgr/src/mission/distributed_data_storage.cpp",
@@ -111,8 +111,8 @@ ohos_unittest("distributedschedsvrtest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("distributedcalltest") {
@@ -126,8 +126,8 @@ ohos_unittest("distributedcalltest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("dschedcontinuetest") {
@@ -145,12 +145,12 @@ ohos_unittest("dschedcontinuetest") {
public_deps = dsched_public_deps
}
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
defines = [ "SUPPORT_DISTRIBUTED_MISSION_MANAGER" ]
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("dschedconnecttest") {
@@ -164,8 +164,8 @@ ohos_unittest("dschedconnecttest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("dschedpermissiontest") {
@@ -179,8 +179,8 @@ ohos_unittest("dschedpermissiontest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("dschedmissionmanagertest") {
@@ -194,8 +194,8 @@ ohos_unittest("dschedmissionmanagertest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
subsystem_name = "distributedschedule"
part_name = "dmsfwk"
subsystem_name = "ability"
}
ohos_unittest("dscheddatastoragetest") {
@@ -209,7 +209,7 @@ ohos_unittest("dscheddatastoragetest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
ohos_unittest("bundlemanagerinternaltest") {
@@ -223,7 +223,7 @@ ohos_unittest("bundlemanagerinternaltest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
ohos_unittest("hisyseventreporttest") {
@@ -237,7 +237,7 @@ ohos_unittest("hisyseventreporttest") {
external_deps = dsched_external_deps
public_deps = dsched_public_deps
}
part_name = "dmsfwk_standard"
part_name = "dmsfwk"
}
group("unittest") {
@@ -249,7 +249,7 @@ group("unittest") {
":dschedconnecttest",
":dschedcontinuetest",
]
if (dmsfwk_standard_mission_manager) {
if (dmsfwk_mission_manager) {
deps += [
":dscheddatastoragetest",
":dschedmissionmanagertest",