From 39ce423ef98259561ba86e73a7d25ad006536087 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 25 Jan 2023 15:40:26 +0200 Subject: [PATCH] Moved edge root rule chain from tenant dir into edge dir --- .../rule_chains/edge_root_rule_chain.json | 0 .../thingsboard/server/service/install/InstallScripts.java | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename application/src/main/data/json/{tenant/edge_management => edge}/rule_chains/edge_root_rule_chain.json (100%) diff --git a/application/src/main/data/json/tenant/edge_management/rule_chains/edge_root_rule_chain.json b/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json similarity index 100% rename from application/src/main/data/json/tenant/edge_management/rule_chains/edge_root_rule_chain.json rename to application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java index 38ff5aacec..893ef5ec20 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java +++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java @@ -59,6 +59,7 @@ public class InstallScripts { public static final String JSON_DIR = "json"; public static final String SYSTEM_DIR = "system"; public static final String TENANT_DIR = "tenant"; + public static final String EDGE_DIR = "edge"; public static final String DEVICE_PROFILE_DIR = "device_profile"; public static final String DEMO_DIR = "demo"; public static final String RULE_CHAINS_DIR = "rule_chains"; @@ -68,8 +69,6 @@ public class InstallScripts { public static final String MODELS_DIR = "models"; public static final String CREDENTIALS_DIR = "credentials"; - public static final String EDGE_MANAGEMENT = "edge_management"; - public static final String JSON_EXT = ".json"; public static final String XML_EXT = ".xml"; @@ -103,7 +102,7 @@ public class InstallScripts { } private Path getEdgeRuleChainsDir() { - return Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, EDGE_MANAGEMENT, RULE_CHAINS_DIR); + return Paths.get(getDataDir(), JSON_DIR, EDGE_DIR, RULE_CHAINS_DIR); } public String getDataDir() {