diff --git a/aafwk/aafwk_standard/BUILD.gn b/aafwk/aafwk_standard/BUILD.gn index eb7367e7f3b3ca44580911810e04ceda3789c5f6..40a2ef2ae232e545cd5e80c721b27abbf1381f0f 100644 --- a/aafwk/aafwk_standard/BUILD.gn +++ b/aafwk/aafwk_standard/BUILD.gn @@ -18,13 +18,24 @@ group("aafwk_standard") { if (is_standard_system) { deps = [ "abilitymanager:actsabilitymanagertest", + "amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest", + "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton", + "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS", + "amsdatauriutils:amsDataUriUtils", + "amszipfileunzipfilest:amsZipfileUnzipfileST", "context:context", "featureability:featureability", "formmanager:formmanager", + "fwkdataaccessor:FWKDataAccessor", + #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest", + "serviceability/sceneProject/particlestartability:ParticleStartAbility", + "serviceability/sceneProject/particletestserver:ParticleTestServer", + "serviceability/stserviceabilityclient:amsStServiceAbilityClient", + "serviceability/stserviceabilityserver:amsStServiceAilityServer", + "serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond", "setshowonlockscreen:setshowonlockscreen", - "want:want", - - #"verifypermission:verifypermission" + #"verifypermission:verifypermission", + "want:want" ] } } diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/BUILD.gn b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/BUILD.gn rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/Test.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/Test.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/config.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/config.json similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/config.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/config.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js index 3ee099f58926b1a7c42f02bb88ebb4998f9e4ac4..4b241cccbaa71f0c5cbd9e7dc437a0feb224c7d5 100644 --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js old mode 100755 new mode 100644 similarity index 92% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js index b4e6ddda2376b782c3d2d29fe0651b89e1e5a83e..bade571c1f528f810c447d8e2aa015fcbce9bcb2 --- a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./DataUriUtilsJsSt.test.js') \ No newline at end of file +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./amsMissionSnapshotTest.test.js') \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/amsMissionSnapshotTest.test.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/amsMissionSnapshotTest.test.js similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/amsMissionSnapshotTest.test.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/amsMissionSnapshotTest.test.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json similarity index 94% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json index b4cba7eb1f2a0fd34f28a04169d0ea48fa9aa104..91303a1fe90ab9bf50a56bcb0c20b76bc9181cbb 100644 --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "MissionSnapshot" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "MissionSnapshot" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/Test.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/Test.json similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/Test.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/Test.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json index 9bd13f9d54cb5f3fe1527865ad7b6e4568529b66..0840c85d792c714f455f49ba64015d27e3392c30 --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/config.json @@ -1,51 +1,51 @@ -{ - "app": { - "bundleName": "com.amsst.amsMissionSnapshotTestSingleton", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.amsMissionSnapshotTestSingleton", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "name": "com.amsst.amsMissionSnapshotTestSingleton.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "singleton", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.amsst.amsMissionSnapshotTestSingleton", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.amsMissionSnapshotTestSingleton", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "name": "com.amsst.amsMissionSnapshotTestSingleton.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "singleton", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/app.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json index 3ef6a8608a2a13717d01a77d1f27a0c9f7ab84fb..7da68b66d19ba86000b5b2e98d3c713d367bce3a --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StServiceAbilityServer" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "StServiceAbilityServer" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/Test.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/Test.json similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/Test.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/Test.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json index 4d90366fb5729ef972f0067fc341173478dfa432..eac10a72de047c6b385161d3468356337953720e --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/config.json @@ -1,51 +1,51 @@ -{ - "app": { - "bundleName": "com.amsst.amsMissionSnapshotTestSingletonS", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.amsMissionSnapshotTestSingletonS", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "name": "com.amsst.amsMissionSnapshotTestSingletonS.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "singleton", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.amsst.amsMissionSnapshotTestSingletonS", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.amsMissionSnapshotTestSingletonS", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "name": "com.amsst.amsMissionSnapshotTestSingletonS.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "singleton", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/app.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json index 3ef6a8608a2a13717d01a77d1f27a0c9f7ab84fb..7da68b66d19ba86000b5b2e98d3c713d367bce3a --- a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StServiceAbilityServer" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "StServiceAbilityServer" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/amsdatauriutils/BUILD.gn b/aafwk/aafwk_standard/amsdatauriutils/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/BUILD.gn rename to aafwk/aafwk_standard/amsdatauriutils/BUILD.gn diff --git a/appexecfwk/ams_standard/amsdatauriutils/Test.json b/aafwk/aafwk_standard/amsdatauriutils/Test.json similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/Test.json rename to aafwk/aafwk_standard/amsdatauriutils/Test.json diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/config.json b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/config.json rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/config.json index 0079c25dbd68dce1bbc4b15332995c829043f10f..f2a1503dbeaaf63d8cf64a4a4f2eef1a6c7d6f53 --- a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/config.json +++ b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/config.json @@ -1,61 +1,61 @@ -{ - "app": { - "bundleName": "com.amsst.amsdatauriutils", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.amsdatauriutils", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.amsst.amsdatauriutils.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} +{ + "app": { + "bundleName": "com.amsst.amsdatauriutils", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.amsdatauriutils", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.amsst.amsdatauriutils.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/app.js index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..c158442201abb1888ae8fb1d57f150c5ec26c36b 100644 --- a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json index fe0fa52c428dd383a77a6b6a312fc74f5d306ee5..e2f89fdc4de97211b7f9cf62e393a1295a6bbc2b --- a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "DataUriUtils" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "DataUriUtils" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/List.test.js similarity index 91% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/List.test.js index 40e23cd987e9f45fd75ed42256496946b3cc3cdf..cffa683ef9706ce75bcb9903a862832fe687d5a5 100644 --- a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./DataAbilityHelperJsSt.test.js') \ No newline at end of file +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./DataUriUtilsJsSt.test.js') \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsdatauriutils/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amsdatauriutils/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/amsdatauriutils/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/amsdatauriutils/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/BUILD.gn b/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/BUILD.gn rename to aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/Test.json b/aafwk/aafwk_standard/amszipfileunzipfilest/Test.json similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/Test.json rename to aafwk/aafwk_standard/amszipfileunzipfilest/Test.json diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/config.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/config.json rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..c158442201abb1888ae8fb1d57f150c5ec26c36b 100644 --- a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json similarity index 95% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json index b586cc29b27e344557a2fe7513c834f50cc56081..e45838540d521b50ee96691690cb7f428c6b1f5b 100644 --- a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/element/string.json @@ -1,20 +1,20 @@ -{ - "string": [ - { - "name": "app_name", - "value": "amsZipfileUnzipfileST" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - }, - { - "name": "serviceability_description", - "value": "hap sample empty service" - }, - { - "name": "serviceability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "amsZipfileUnzipfileST" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + }, + { + "name": "serviceability_description", + "value": "hap sample empty service" + }, + { + "name": "serviceability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/test/ContextJsunit.test.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/ContextJsunit.test.js similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/test/ContextJsunit.test.js rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/ContextJsunit.test.js diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js similarity index 97% rename from appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js index 4e9ffc9e832d88284bbfd473014229d16dc2ce68..b5d5265591aba656f6112e40a64a7cf0f8af254d 100644 --- a/appexecfwk/ams_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./ContextJsunit.test.js') +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./ContextJsunit.test.js') diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/fwkdataaccessor/BUILD.gn b/aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/BUILD.gn rename to aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn diff --git a/appexecfwk/ams_standard/fwkdataaccessor/Test.json b/aafwk/aafwk_standard/fwkdataaccessor/Test.json similarity index 87% rename from appexecfwk/ams_standard/fwkdataaccessor/Test.json rename to aafwk/aafwk_standard/fwkdataaccessor/Test.json index 5d6bddcf3b4ad86236117daf1351a208e68f3405..9d96803aaaf2bf52cd284eb322e16e18c18e2a4b 100644 --- a/appexecfwk/ams_standard/fwkdataaccessor/Test.json +++ b/aafwk/aafwk_standard/fwkdataaccessor/Test.json @@ -1,19 +1,19 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.amsst.fwkdataaccessor", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "FWKDataAccessor.hap", - "amsStDataAbility.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "180000", + "package": "com.amsst.fwkdataaccessor", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "FWKDataAccessor.hap", + "./resource/appexecfwk/amsStDataAbility.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/config.json b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/config.json similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/config.json rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/config.json diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/app.js index 3ee099f58926b1a7c42f02bb88ebb4998f9e4ac4..4b241cccbaa71f0c5cbd9e7dc437a0feb224c7d5 100644 --- a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json similarity index 94% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json index e0fe66e5544070f2dc986fec302f31b66d70e239..baf5b3c1c2a555bed22561a88aca6d857522d425 100644 --- a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "STDataAbility" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "STDataAbility" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/DataAbilityHelperJsSt.test.js b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/DataAbilityHelperJsSt.test.js similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/DataAbilityHelperJsSt.test.js rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/DataAbilityHelperJsSt.test.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js similarity index 91% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js index 2a0e2e7c28b34893374a3c3451fb200fc1ff368f..d959eda1200e95c868a80ccab7d8c11fa9604463 100644 --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./amsMissionSnapshotTest.test.js') \ No newline at end of file +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./DataAbilityHelperJsSt.test.js') \ No newline at end of file diff --git a/appexecfwk/ams_standard/fwkdataaccessor/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/fwkdataaccessor/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/fwkdataaccessor/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/fwkdataaccessor/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/BUILD.gn b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/BUILD.gn old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/BUILD.gn rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/Test.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/Test.json diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json similarity index 95% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json index 2751fc4595ba20209a8ae785f67f3a60fcbe935f..42ac71c00faca82e6b53a9c1dd7a275a0a192cf5 100644 --- a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json +++ b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/config.json @@ -1,61 +1,61 @@ -{ - "app": { - "bundleName": "com.example.actsparticleabilitytest", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.actsparticleabilitytest", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.example.actsparticleabilitytest.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.example.actsparticleabilitytest", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.actsparticleabilitytest", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.actsparticleabilitytest.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..56256d2f8ccdb2936bd5d2ff28668d7a84f49a39 100644 --- a/appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js @@ -1,22 +1,23 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } + +}; diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json similarity index 94% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json index 361c4b2c44a657200be50d8e69b7d0d05cc549db..03574a36c533357eef7fc0acc5e21af14f4e5f67 100644 --- a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "actsparticleabilitytest" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "actsparticleabilitytest" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/ActsParticleAbilityTest.test.js b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/ActsParticleAbilityTest.test.js similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/ActsParticleAbilityTest.test.js rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/ActsParticleAbilityTest.test.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js old mode 100755 new mode 100644 similarity index 91% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js index 743019cefecd0ea58dcc03f730d7c9295f731ecf..d8d981f8f3222cb435202f5a37d7a05fb9d79eb8 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./StServiceAbilityClient.test.js') \ No newline at end of file +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./ActsParticleAbilityTest.test.js') \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/actsparticleabilitytest/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/actsparticleabilitytest/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/BUILD.gn b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/BUILD.gn rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/Test.json b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/Test.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/Test.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/Test.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/config.json b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/config.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/config.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/config.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js similarity index 97% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..c158442201abb1888ae8fb1d57f150c5ec26c36b 100644 --- a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json similarity index 94% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json index d6b8a991f39af9e187a6eec2427c0c652a4a9a21..fd60cdefa929070f1798c6e36f0502f1e1e219a4 100644 --- a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "particlestartability" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "particlestartability" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/BUILD.gn b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/BUILD.gn rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/Test.json b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/Test.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/Test.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/Test.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/config.json b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/config.json similarity index 95% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/config.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/config.json index 22910ec46db79951749e8dba6495ba4352d4cf05..9b579747570577f91580403b596703b493549211 100644 --- a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/config.json +++ b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/config.json @@ -1,52 +1,52 @@ -{ - "app": { - "bundleName": "com.example.particletestserver", - "vendor": "neusoft", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.particletestserver", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": true - }, - "abilities": [ - { - "visible": true, - "name": "com.example.particletestserver.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "service", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.example.particletestserver", + "vendor": "neusoft", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.particletestserver", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": true + }, + "abilities": [ + { + "visible": true, + "name": "com.example.particletestserver.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "service", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..c158442201abb1888ae8fb1d57f150c5ec26c36b --- /dev/null +++ b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.css similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.hml similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.js similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json similarity index 94% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json index 30c8e117945b483c0a31987861b29cd3b07a4ff6..45cc67c611762eee10326a30ea30e49026767e8e 100644 --- a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "particletestserver" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "particletestserver" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/BUILD.gn b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/BUILD.gn rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/Test.json b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/Test.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/Test.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/Test.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/config.json b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/config.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/config.json index 84890df7335177b0fa3f73483d78a15185b8c4ad..0b7a94e75cd1344284ae889e56a94e4e13d922aa --- a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/config.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/config.json @@ -1,61 +1,61 @@ -{ - "app": { - "bundleName": "com.amsst.stserviceabilityclient", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.stserviceabilityclient", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.amsst.stserviceabilityclient.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} +{ + "app": { + "bundleName": "com.amsst.stserviceabilityclient", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.stserviceabilityclient", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.amsst.stserviceabilityclient.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} diff --git a/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js new file mode 100644 index 0000000000000000000000000000000000000000..c158442201abb1888ae8fb1d57f150c5ec26c36b --- /dev/null +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json index 9a1bb8affb74fb80fa06d11d9b51c17347b2e0ee..a3d6946ded2ae6c810549377cc0c386ad257eb53 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StSeAbClient" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] +{ + "string": [ + { + "name": "app_name", + "value": "StSeAbClient" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js similarity index 91% rename from appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js index 83ff8beaa45f70c6ee550190667e25bc1ffd74ac..b95011487ce47ce48bb7b8b8f1bcee9e5f563cdc 100644 --- a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js @@ -1,15 +1,15 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -require('./ActsParticleAbilityTest.test.js') \ No newline at end of file +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * 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. + */ +require('./StServiceAbilityClient.test.js') \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/StServiceAbilityClient.test.js b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/StServiceAbilityClient.test.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/StServiceAbilityClient.test.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/StServiceAbilityClient.test.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/stserviceabilityclient/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityclient/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/stserviceabilityclient/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/BUILD.gn diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/Test.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/Test.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/Test.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/Test.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/config.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/config.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/config.json index 174f49a873c9a365e78cc8c35da1e82e0739f44a..cffe0cc26bcf977d97d9290ce7bde258b9cb82a0 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/config.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/config.json @@ -1,53 +1,53 @@ -{ - "app": { - "bundleName": "com.amsst.stserviceabilityserver", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.stserviceabilityserver", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": true - }, - "abilities": [ - { - "name": "com.amsst.stserviceabilityserver.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "service", - "visible": true, - "uri": "serviceability://com.amsst.stserviceabilityserver", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.amsst.stserviceabilityserver", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.stserviceabilityserver", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": true + }, + "abilities": [ + { + "name": "com.amsst.stserviceabilityserver.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "service", + "visible": true, + "uri": "serviceability://com.amsst.stserviceabilityserver", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/app.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json index 3ef6a8608a2a13717d01a77d1f27a0c9f7ab84fb..7da68b66d19ba86000b5b2e98d3c713d367bce3a --- a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StServiceAbilityServer" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "StServiceAbilityServer" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/stserviceabilityserver/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserver/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/stserviceabilityserver/signature/openharmony_sx.p7b diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/BUILD.gn b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/BUILD.gn similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/BUILD.gn rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/BUILD.gn diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/Test.json similarity index 95% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/Test.json index 3ec911dfc7b3a17504cd4577be5bbabaf7f97e63..4300a64be9af93e37a31f6b5c6fc734e8f1b4563 100644 --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/Test.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/Test.json @@ -1,3 +1,3 @@ -{ - "description": "Configuration for hjunit demo Tests" -} +{ + "description": "Configuration for hjunit demo Tests" +} diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json old mode 100755 new mode 100644 similarity index 95% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json index d0d69567dd9e65841d154ef805645e6a15cb265f..295fc4699ea9c7a12b88466eeb8d2b6267e3f920 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/config.json @@ -1,53 +1,53 @@ -{ - "app": { - "bundleName": "com.amsst.stserviceabilityserversecond", - "vendor": "amsst", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.amsst.stserviceabilityserversecond", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": true - }, - "abilities": [ - { - "name": "com.amsst.stserviceabilityserversecond.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "service", - "visible": true, - "uri": "serviceability://com.amsst.stserviceabilityserversecond", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.amsst.stserviceabilityserversecond", + "vendor": "amsst", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.amsst.stserviceabilityserversecond", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": true + }, + "abilities": [ + { + "name": "com.amsst.stserviceabilityserversecond.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "service", + "visible": true, + "uri": "serviceability://com.amsst.stserviceabilityserversecond", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } } \ No newline at end of file diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/app.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/app.js diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/en-US.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/en-US.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/zh-CN.json old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.css diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.hml old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.hml diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/default/pages/index/index.js diff --git a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json old mode 100755 new mode 100644 similarity index 94% rename from appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json index 3ef6a8608a2a13717d01a77d1f27a0c9f7ab84fb..7da68b66d19ba86000b5b2e98d3c713d367bce3a --- a/appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/entry/src/main/js/resources/base/element/string.json +++ b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "app_name", - "value": "StServiceAbilityServer" - }, - { - "name": "mainability_description", - "value": "hap sample empty page" - } - ] -} +{ + "string": [ + { + "name": "app_name", + "value": "StServiceAbilityServer" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/media/icon.png old mode 100755 new mode 100644 similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/media/icon.png rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/signature/openharmony_sx.p7b similarity index 100% rename from appexecfwk/ams_standard/serviceability/stserviceabilityserversecond/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/signature/openharmony_sx.p7b diff --git a/appexecfwk/BUILD.gn b/appexecfwk/BUILD.gn index 7ec40f220e48a82c9104d1d260ea3a9266c80415..66a34aed0f9e8607bdf20224ca96ecb56cbec8b5 100644 --- a/appexecfwk/BUILD.gn +++ b/appexecfwk/BUILD.gn @@ -16,9 +16,6 @@ import("//build/ohos_var.gni") group("appexecfwk") { testonly = true if (is_standard_system) { - deps = [ - "ams_standard:ams_standard", - "bundle_standard:bundle_standard", - ] + deps = [ "bundle_standard:bundle_standard" ] } } diff --git a/appexecfwk/ams_standard/BUILD.gn b/appexecfwk/ams_standard/BUILD.gn deleted file mode 100644 index a1524af34951ab641d557a7caf1e724a2122c313..0000000000000000000000000000000000000000 --- a/appexecfwk/ams_standard/BUILD.gn +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# 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. - -import("//build/ohos_var.gni") - -group("ams_standard") { - testonly = true - if (is_standard_system) { - deps = [ - "amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest", - "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton", - "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS", - "amsdatauriutils:amsDataUriUtils", - "amszipfileunzipfilest:amsZipfileUnzipfileST", - "fwkdataaccessor:FWKDataAccessor", - - #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest", - "serviceability/sceneProject/particlestartability:ParticleStartAbility", - "serviceability/sceneProject/particletestserver:ParticleTestServer", - "serviceability/stserviceabilityclient:amsStServiceAbilityClient", - "serviceability/stserviceabilityserver:amsStServiceAilityServer", - "serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond", - ] - } -} diff --git a/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap b/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap deleted file mode 100644 index a3b5384320ea49717968f6e8d5d5e88963b4e436..0000000000000000000000000000000000000000 Binary files a/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap and /dev/null differ diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js b/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js deleted file mode 100644 index 03b496a21860e50ece4bd980ee137602801e68bc..0000000000000000000000000000000000000000 --- a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } - -}; diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js b/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js deleted file mode 100644 index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..0000000000000000000000000000000000000000 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * 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. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -};