From e3676a3470d3443cc444b5ce532bf43e575530f4 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Jul 2023 10:47:30 +0200 Subject: [PATCH] [DEMO] ui5.yaml: Use new 'component' type Based on https://github.com/SAP/ui5-project/pull/623 --- .../{my/lib/sample/base => }/BaseController.js | 0 .../src/{my/lib/sample/base => }/Component.js | 0 .../src/{my/lib/sample/base => }/manifest.json | 2 +- .../src/my/lib/sample/base/library.js | 15 --------------- demo/BaseComponent/ui5.yaml | 8 ++------ .../{my/lib/sample/categories => }/Component.js | 0 .../categories => }/controller/App.controller.js | 0 .../controller/Detail.controller.js | 0 .../categories => }/controller/List.controller.js | 0 .../{my/lib/sample/categories => }/css/style.css | 0 .../sample/categories => }/i18n/i18n.properties | 0 .../categories => }/localService/metadata.xml | 0 .../localService/mockdata/Categories.json | 0 .../localService/mockdata/Products.json | 0 .../localService/mockdata/Suppliers.json | 0 .../categories => }/localService/mockserver.js | 0 .../{my/lib/sample/categories => }/manifest.json | 0 .../sample/categories => }/test/initMockServer.js | 0 .../sample/categories => }/test/mockServer.html | 0 .../lib/sample/categories => }/view/App.view.xml | 0 .../sample/categories => }/view/Detail.view.xml | 0 .../lib/sample/categories => }/view/List.view.xml | 0 .../sample/categories => }/view/NotFound.view.xml | 0 demo/CategoriesComponent/ui5.yaml | 10 +++------- .../src/{my/lib/sample/products => }/Component.js | 0 .../products => }/controller/App.controller.js | 0 .../products => }/controller/Detail.controller.js | 0 .../products => }/controller/List.controller.js | 0 .../{my/lib/sample/products => }/css/style.css | 0 .../lib/sample/products => }/i18n/i18n.properties | 0 .../products => }/localService/metadata.xml | 0 .../localService/mockdata/Categories.json | 0 .../localService/mockdata/Products.json | 0 .../localService/mockdata/Suppliers.json | 0 .../products => }/localService/mockserver.js | 0 .../{my/lib/sample/products => }/manifest.json | 0 .../sample/products => }/test/initMockServer.js | 0 .../lib/sample/products => }/test/mockServer.html | 0 .../lib/sample/products => }/view/App.view.xml | 0 .../lib/sample/products => }/view/Detail.view.xml | 0 .../lib/sample/products => }/view/List.view.xml | 0 .../sample/products => }/view/NotFound.view.xml | 0 demo/ProductsComponent/ui5.yaml | 8 ++------ .../{my/lib/sample/suppliers => }/Component.js | 0 .../suppliers => }/controller/App.controller.js | 0 .../controller/Detail.controller.js | 0 .../suppliers => }/controller/List.controller.js | 0 .../{my/lib/sample/suppliers => }/css/style.css | 0 .../sample/suppliers => }/i18n/i18n.properties | 0 .../src/{my/lib/sample/suppliers => }/index.html | 0 .../suppliers => }/localService/metadata.xml | 0 .../localService/mockdata/Categories.json | 0 .../localService/mockdata/Products.json | 0 .../localService/mockdata/Suppliers.json | 0 .../suppliers => }/localService/mockserver.js | 0 .../{my/lib/sample/suppliers => }/manifest.json | 0 .../sample/suppliers => }/test/initMockServer.js | 0 .../sample/suppliers => }/test/mockServer.html | 0 .../lib/sample/suppliers => }/view/App.view.xml | 0 .../sample/suppliers => }/view/Detail.view.xml | 0 .../lib/sample/suppliers => }/view/List.view.xml | 0 .../sample/suppliers => }/view/NotFound.view.xml | 0 demo/SuppliersComponent/ui5.yaml | 8 ++------ 63 files changed, 10 insertions(+), 41 deletions(-) rename demo/BaseComponent/src/{my/lib/sample/base => }/BaseController.js (100%) rename demo/BaseComponent/src/{my/lib/sample/base => }/Component.js (100%) rename demo/BaseComponent/src/{my/lib/sample/base => }/manifest.json (97%) delete mode 100644 demo/BaseComponent/src/my/lib/sample/base/library.js rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/Component.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/controller/App.controller.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/controller/Detail.controller.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/controller/List.controller.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/css/style.css (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/i18n/i18n.properties (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/localService/metadata.xml (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/localService/mockdata/Categories.json (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/localService/mockdata/Products.json (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/localService/mockdata/Suppliers.json (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/localService/mockserver.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/manifest.json (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/test/initMockServer.js (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/test/mockServer.html (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/view/App.view.xml (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/view/Detail.view.xml (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/view/List.view.xml (100%) rename demo/CategoriesComponent/src/{my/lib/sample/categories => }/view/NotFound.view.xml (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/Component.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/controller/App.controller.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/controller/Detail.controller.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/controller/List.controller.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/css/style.css (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/i18n/i18n.properties (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/localService/metadata.xml (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/localService/mockdata/Categories.json (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/localService/mockdata/Products.json (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/localService/mockdata/Suppliers.json (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/localService/mockserver.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/manifest.json (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/test/initMockServer.js (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/test/mockServer.html (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/view/App.view.xml (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/view/Detail.view.xml (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/view/List.view.xml (100%) rename demo/ProductsComponent/src/{my/lib/sample/products => }/view/NotFound.view.xml (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/Component.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/controller/App.controller.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/controller/Detail.controller.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/controller/List.controller.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/css/style.css (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/i18n/i18n.properties (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/index.html (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/localService/metadata.xml (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/localService/mockdata/Categories.json (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/localService/mockdata/Products.json (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/localService/mockdata/Suppliers.json (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/localService/mockserver.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/manifest.json (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/test/initMockServer.js (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/test/mockServer.html (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/view/App.view.xml (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/view/Detail.view.xml (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/view/List.view.xml (100%) rename demo/SuppliersComponent/src/{my/lib/sample/suppliers => }/view/NotFound.view.xml (100%) diff --git a/demo/BaseComponent/src/my/lib/sample/base/BaseController.js b/demo/BaseComponent/src/BaseController.js similarity index 100% rename from demo/BaseComponent/src/my/lib/sample/base/BaseController.js rename to demo/BaseComponent/src/BaseController.js diff --git a/demo/BaseComponent/src/my/lib/sample/base/Component.js b/demo/BaseComponent/src/Component.js similarity index 100% rename from demo/BaseComponent/src/my/lib/sample/base/Component.js rename to demo/BaseComponent/src/Component.js diff --git a/demo/BaseComponent/src/my/lib/sample/base/manifest.json b/demo/BaseComponent/src/manifest.json similarity index 97% rename from demo/BaseComponent/src/my/lib/sample/base/manifest.json rename to demo/BaseComponent/src/manifest.json index e4521d670..bd8455301 100644 --- a/demo/BaseComponent/src/my/lib/sample/base/manifest.json +++ b/demo/BaseComponent/src/manifest.json @@ -2,7 +2,7 @@ "_version": "1.21.0", "sap.app": { "id": "my.lib.sample.base", - "type": "library", + "type": "application", "embeds": [], "applicationVersion": { "version": "${version}" diff --git a/demo/BaseComponent/src/my/lib/sample/base/library.js b/demo/BaseComponent/src/my/lib/sample/base/library.js deleted file mode 100644 index 9cd766b15..000000000 --- a/demo/BaseComponent/src/my/lib/sample/base/library.js +++ /dev/null @@ -1,15 +0,0 @@ -sap.ui.define(function() { - - "use strict"; - - sap.ui.getCore().initLibrary({ - name : "my.lib.sample.base", - version : "${version}", - noLibraryCSS: true, - dependencies : [ "sap.ui.core" ], - controls : [ ], - types : [ ] - }); - - return my.lib.sample.base; -}); diff --git a/demo/BaseComponent/ui5.yaml b/demo/BaseComponent/ui5.yaml index c8f3da82d..89b1aa15e 100644 --- a/demo/BaseComponent/ui5.yaml +++ b/demo/BaseComponent/ui5.yaml @@ -1,13 +1,9 @@ -specVersion: "2.6" +specVersion: "3.1" metadata: name: my.lib.sample.base -type: library +type: component framework: name: OpenUI5 version: 1.110.0 libraries: - name: sap.ui.core -builder: - componentPreload: - namespaces: - - "my/lib/sample/base" diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/Component.js b/demo/CategoriesComponent/src/Component.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/Component.js rename to demo/CategoriesComponent/src/Component.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/controller/App.controller.js b/demo/CategoriesComponent/src/controller/App.controller.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/controller/App.controller.js rename to demo/CategoriesComponent/src/controller/App.controller.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/controller/Detail.controller.js b/demo/CategoriesComponent/src/controller/Detail.controller.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/controller/Detail.controller.js rename to demo/CategoriesComponent/src/controller/Detail.controller.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/controller/List.controller.js b/demo/CategoriesComponent/src/controller/List.controller.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/controller/List.controller.js rename to demo/CategoriesComponent/src/controller/List.controller.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/css/style.css b/demo/CategoriesComponent/src/css/style.css similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/css/style.css rename to demo/CategoriesComponent/src/css/style.css diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/i18n/i18n.properties b/demo/CategoriesComponent/src/i18n/i18n.properties similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/i18n/i18n.properties rename to demo/CategoriesComponent/src/i18n/i18n.properties diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/localService/metadata.xml b/demo/CategoriesComponent/src/localService/metadata.xml similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/localService/metadata.xml rename to demo/CategoriesComponent/src/localService/metadata.xml diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Categories.json b/demo/CategoriesComponent/src/localService/mockdata/Categories.json similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Categories.json rename to demo/CategoriesComponent/src/localService/mockdata/Categories.json diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Products.json b/demo/CategoriesComponent/src/localService/mockdata/Products.json similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Products.json rename to demo/CategoriesComponent/src/localService/mockdata/Products.json diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Suppliers.json b/demo/CategoriesComponent/src/localService/mockdata/Suppliers.json similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockdata/Suppliers.json rename to demo/CategoriesComponent/src/localService/mockdata/Suppliers.json diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockserver.js b/demo/CategoriesComponent/src/localService/mockserver.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/localService/mockserver.js rename to demo/CategoriesComponent/src/localService/mockserver.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/manifest.json b/demo/CategoriesComponent/src/manifest.json similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/manifest.json rename to demo/CategoriesComponent/src/manifest.json diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/test/initMockServer.js b/demo/CategoriesComponent/src/test/initMockServer.js similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/test/initMockServer.js rename to demo/CategoriesComponent/src/test/initMockServer.js diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/test/mockServer.html b/demo/CategoriesComponent/src/test/mockServer.html similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/test/mockServer.html rename to demo/CategoriesComponent/src/test/mockServer.html diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/view/App.view.xml b/demo/CategoriesComponent/src/view/App.view.xml similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/view/App.view.xml rename to demo/CategoriesComponent/src/view/App.view.xml diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/view/Detail.view.xml b/demo/CategoriesComponent/src/view/Detail.view.xml similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/view/Detail.view.xml rename to demo/CategoriesComponent/src/view/Detail.view.xml diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/view/List.view.xml b/demo/CategoriesComponent/src/view/List.view.xml similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/view/List.view.xml rename to demo/CategoriesComponent/src/view/List.view.xml diff --git a/demo/CategoriesComponent/src/my/lib/sample/categories/view/NotFound.view.xml b/demo/CategoriesComponent/src/view/NotFound.view.xml similarity index 100% rename from demo/CategoriesComponent/src/my/lib/sample/categories/view/NotFound.view.xml rename to demo/CategoriesComponent/src/view/NotFound.view.xml diff --git a/demo/CategoriesComponent/ui5.yaml b/demo/CategoriesComponent/ui5.yaml index cba63acce..b692ebad2 100644 --- a/demo/CategoriesComponent/ui5.yaml +++ b/demo/CategoriesComponent/ui5.yaml @@ -1,15 +1,11 @@ -specVersion: "2.6" +specVersion: "3.1" metadata: name: my.lib.sample.categories -type: library +type: component framework: name: OpenUI5 version: 1.110.0 libraries: - name: sap.ui.core - name: sap.m - - name: themelib_sap_horizon -builder: - componentPreload: - namespaces: - - "my/lib/sample/categories" \ No newline at end of file + - name: themelib_sap_horizon \ No newline at end of file diff --git a/demo/ProductsComponent/src/my/lib/sample/products/Component.js b/demo/ProductsComponent/src/Component.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/Component.js rename to demo/ProductsComponent/src/Component.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/controller/App.controller.js b/demo/ProductsComponent/src/controller/App.controller.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/controller/App.controller.js rename to demo/ProductsComponent/src/controller/App.controller.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/controller/Detail.controller.js b/demo/ProductsComponent/src/controller/Detail.controller.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/controller/Detail.controller.js rename to demo/ProductsComponent/src/controller/Detail.controller.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/controller/List.controller.js b/demo/ProductsComponent/src/controller/List.controller.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/controller/List.controller.js rename to demo/ProductsComponent/src/controller/List.controller.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/css/style.css b/demo/ProductsComponent/src/css/style.css similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/css/style.css rename to demo/ProductsComponent/src/css/style.css diff --git a/demo/ProductsComponent/src/my/lib/sample/products/i18n/i18n.properties b/demo/ProductsComponent/src/i18n/i18n.properties similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/i18n/i18n.properties rename to demo/ProductsComponent/src/i18n/i18n.properties diff --git a/demo/ProductsComponent/src/my/lib/sample/products/localService/metadata.xml b/demo/ProductsComponent/src/localService/metadata.xml similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/localService/metadata.xml rename to demo/ProductsComponent/src/localService/metadata.xml diff --git a/demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Categories.json b/demo/ProductsComponent/src/localService/mockdata/Categories.json similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Categories.json rename to demo/ProductsComponent/src/localService/mockdata/Categories.json diff --git a/demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Products.json b/demo/ProductsComponent/src/localService/mockdata/Products.json similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Products.json rename to demo/ProductsComponent/src/localService/mockdata/Products.json diff --git a/demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Suppliers.json b/demo/ProductsComponent/src/localService/mockdata/Suppliers.json similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/localService/mockdata/Suppliers.json rename to demo/ProductsComponent/src/localService/mockdata/Suppliers.json diff --git a/demo/ProductsComponent/src/my/lib/sample/products/localService/mockserver.js b/demo/ProductsComponent/src/localService/mockserver.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/localService/mockserver.js rename to demo/ProductsComponent/src/localService/mockserver.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/manifest.json b/demo/ProductsComponent/src/manifest.json similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/manifest.json rename to demo/ProductsComponent/src/manifest.json diff --git a/demo/ProductsComponent/src/my/lib/sample/products/test/initMockServer.js b/demo/ProductsComponent/src/test/initMockServer.js similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/test/initMockServer.js rename to demo/ProductsComponent/src/test/initMockServer.js diff --git a/demo/ProductsComponent/src/my/lib/sample/products/test/mockServer.html b/demo/ProductsComponent/src/test/mockServer.html similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/test/mockServer.html rename to demo/ProductsComponent/src/test/mockServer.html diff --git a/demo/ProductsComponent/src/my/lib/sample/products/view/App.view.xml b/demo/ProductsComponent/src/view/App.view.xml similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/view/App.view.xml rename to demo/ProductsComponent/src/view/App.view.xml diff --git a/demo/ProductsComponent/src/my/lib/sample/products/view/Detail.view.xml b/demo/ProductsComponent/src/view/Detail.view.xml similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/view/Detail.view.xml rename to demo/ProductsComponent/src/view/Detail.view.xml diff --git a/demo/ProductsComponent/src/my/lib/sample/products/view/List.view.xml b/demo/ProductsComponent/src/view/List.view.xml similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/view/List.view.xml rename to demo/ProductsComponent/src/view/List.view.xml diff --git a/demo/ProductsComponent/src/my/lib/sample/products/view/NotFound.view.xml b/demo/ProductsComponent/src/view/NotFound.view.xml similarity index 100% rename from demo/ProductsComponent/src/my/lib/sample/products/view/NotFound.view.xml rename to demo/ProductsComponent/src/view/NotFound.view.xml diff --git a/demo/ProductsComponent/ui5.yaml b/demo/ProductsComponent/ui5.yaml index 470b08363..b21e8a369 100644 --- a/demo/ProductsComponent/ui5.yaml +++ b/demo/ProductsComponent/ui5.yaml @@ -1,7 +1,7 @@ -specVersion: "2.6" +specVersion: "3.1" metadata: name: my.lib.sample.products -type: library +type: component framework: name: OpenUI5 version: 1.110.0 @@ -9,7 +9,3 @@ framework: - name: sap.ui.core - name: sap.m - name: themelib_sap_horizon -builder: - componentPreload: - namespaces: - - "my/lib/sample/products" \ No newline at end of file diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/Component.js b/demo/SuppliersComponent/src/Component.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/Component.js rename to demo/SuppliersComponent/src/Component.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/App.controller.js b/demo/SuppliersComponent/src/controller/App.controller.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/App.controller.js rename to demo/SuppliersComponent/src/controller/App.controller.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/Detail.controller.js b/demo/SuppliersComponent/src/controller/Detail.controller.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/Detail.controller.js rename to demo/SuppliersComponent/src/controller/Detail.controller.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/List.controller.js b/demo/SuppliersComponent/src/controller/List.controller.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/controller/List.controller.js rename to demo/SuppliersComponent/src/controller/List.controller.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/css/style.css b/demo/SuppliersComponent/src/css/style.css similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/css/style.css rename to demo/SuppliersComponent/src/css/style.css diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/i18n/i18n.properties b/demo/SuppliersComponent/src/i18n/i18n.properties similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/i18n/i18n.properties rename to demo/SuppliersComponent/src/i18n/i18n.properties diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/index.html b/demo/SuppliersComponent/src/index.html similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/index.html rename to demo/SuppliersComponent/src/index.html diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/metadata.xml b/demo/SuppliersComponent/src/localService/metadata.xml similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/metadata.xml rename to demo/SuppliersComponent/src/localService/metadata.xml diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Categories.json b/demo/SuppliersComponent/src/localService/mockdata/Categories.json similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Categories.json rename to demo/SuppliersComponent/src/localService/mockdata/Categories.json diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Products.json b/demo/SuppliersComponent/src/localService/mockdata/Products.json similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Products.json rename to demo/SuppliersComponent/src/localService/mockdata/Products.json diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Suppliers.json b/demo/SuppliersComponent/src/localService/mockdata/Suppliers.json similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockdata/Suppliers.json rename to demo/SuppliersComponent/src/localService/mockdata/Suppliers.json diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockserver.js b/demo/SuppliersComponent/src/localService/mockserver.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/localService/mockserver.js rename to demo/SuppliersComponent/src/localService/mockserver.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/manifest.json b/demo/SuppliersComponent/src/manifest.json similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/manifest.json rename to demo/SuppliersComponent/src/manifest.json diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/test/initMockServer.js b/demo/SuppliersComponent/src/test/initMockServer.js similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/test/initMockServer.js rename to demo/SuppliersComponent/src/test/initMockServer.js diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/test/mockServer.html b/demo/SuppliersComponent/src/test/mockServer.html similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/test/mockServer.html rename to demo/SuppliersComponent/src/test/mockServer.html diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/view/App.view.xml b/demo/SuppliersComponent/src/view/App.view.xml similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/view/App.view.xml rename to demo/SuppliersComponent/src/view/App.view.xml diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/view/Detail.view.xml b/demo/SuppliersComponent/src/view/Detail.view.xml similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/view/Detail.view.xml rename to demo/SuppliersComponent/src/view/Detail.view.xml diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/view/List.view.xml b/demo/SuppliersComponent/src/view/List.view.xml similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/view/List.view.xml rename to demo/SuppliersComponent/src/view/List.view.xml diff --git a/demo/SuppliersComponent/src/my/lib/sample/suppliers/view/NotFound.view.xml b/demo/SuppliersComponent/src/view/NotFound.view.xml similarity index 100% rename from demo/SuppliersComponent/src/my/lib/sample/suppliers/view/NotFound.view.xml rename to demo/SuppliersComponent/src/view/NotFound.view.xml diff --git a/demo/SuppliersComponent/ui5.yaml b/demo/SuppliersComponent/ui5.yaml index c4b403f40..7c4c52af9 100644 --- a/demo/SuppliersComponent/ui5.yaml +++ b/demo/SuppliersComponent/ui5.yaml @@ -1,7 +1,7 @@ -specVersion: "2.6" +specVersion: "3.1" metadata: name: my.lib.sample.suppliers -type: library +type: component framework: name: OpenUI5 version: 1.110.0 @@ -9,7 +9,3 @@ framework: - name: sap.ui.core - name: sap.m - name: themelib_sap_horizon -builder: - componentPreload: - namespaces: - - "my/lib/sample/suppliers"