Move root to storage

diff --git a/build-package.sh b/build-package.sh
index 4a30205ac72354271ecaa8eeec45ccc81427f045..a91d28783fda6f0d68f29bf07340b9f6cbe50e86 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 rm -rf openmediavault-zfs/usr/share/openmediavault/engined/rpc
 mkdir -p openmediavault-zfs/usr/share/openmediavault/engined/rpc/zfs
-rm -rf openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/service/zfs
-mkdir -p openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/service/zfs
+rm -rf openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/storage/zfs
+mkdir -p openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/storage/zfs
 rm -rf openmediavault-zfs/var/www/openmediavault/images
 mkdir -p openmediavault-zfs/var/www/openmediavault/images
 cp src/* openmediavault-zfs/usr/share/openmediavault/engined/rpc/zfs
 cp gui/rpc/zfs.inc openmediavault-zfs/usr/share/openmediavault/engined/rpc
-cp gui/js/omv/module/admin/service/zfs/* openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/service/zfs
+cp gui/js/omv/module/admin/storage/zfs/* openmediavault-zfs/var/www/openmediavault/js/omv/module/admin/storage/zfs
 cp images/* openmediavault-zfs/var/www/openmediavault/images
 cd openmediavault-zfs
 dpkg-buildpackage -us -uc

diff --git a/gui/js/omv/module/admin/storage/zfs/Overview.js b/gui/js/omv/module/admin/storage/zfs/Overview.js
index 1084501d663956eda2c2c9f829a3f8895259cde6..306edcff0b9bae92f232ccf3daa330ab4c1569ad 100644 (file)
--- a/gui/js/omv/module/admin/storage/zfs/Overview.js
+++ b/gui/js/omv/module/admin/storage/zfs/Overview.js
@@ -1,8 +1,8 @@
 // require("js/omv/tree/Panel.js")
-// require("js/omv/module/admin/service/zfs/TreePanel.js")
+// require("js/omv/module/admin/storage/zfs/TreePanel.js")
 // require("js/omv/workspace/window/Grid.js")
 
-Ext.define("OMV.module.admin.services.zfs.AddObject", {
+Ext.define("OMV.module.admin.storage.zfs.AddObject", {
        extend: "OMV.workspace.window.Form",
        uses: [
                "OMV.data.Store",
@@ -79,7 +79,7 @@ Ext.define("OMV.module.admin.services.zfs.AddObject", {
 
 
 
-Ext.define("OMV.module.admin.service.zfs.EditProperties", {
+Ext.define("OMV.module.admin.storage.zfs.EditProperties", {
        extend: "OMV.workspace.window.Grid",
        requires: [
                "OMV.data.Store",
@@ -271,7 +271,7 @@ Ext.define("OMV.module.admin.service.zfs.EditProperties", {
 });
 
 
-Ext.define("OMV.module.admin.services.zfs.CreateShare", {
+Ext.define("OMV.module.admin.storage.zfs.CreateShare", {
        extend: "OMV.workspace.window.Form",
        uses: [
                "OMV.data.Store",