From 08da8de5cf0d0f554cd071b2ec49f9c72c8e1718 Mon Sep 17 00:00:00 2001 From: Christoph Weitkamp Date: Fri, 17 Jan 2020 15:29:18 +0100 Subject: [PATCH] Moved "ESH-INF/" folders to "OH-INF/" folders (#1328) * Moved ESH-INF folders to OH-INF folders Signed-off-by: Christoph Weitkamp --- .../{ESH-INF => OH-INF}/config/config.xml | 0 .../moduletypes/PrivateScriptedTypes.json | 0 .../AbstractResourceBundleProvider.java | 8 ++++---- .../moduletypes/ChannelTrigger.json | 0 .../moduletypes/DayOfWeekCondition.json | 0 .../moduletypes/EphemerisConditions.json | 0 .../moduletypes/GenericConditions.json | 0 .../moduletypes/GenericCronTrigger.json | 0 .../moduletypes/GenericTriggers.json | 0 .../automation/moduletypes/ItemActions.json | 0 .../moduletypes/ItemConditions.json | 0 .../automation/moduletypes/ItemTriggers.json | 0 .../moduletypes/RuleEnablementAction.json | 0 .../automation/moduletypes/RunRuleAction.json | 0 .../automation/moduletypes/ThingTriggers.json | 0 .../moduletypes/TimeOfDayCondition.json | 0 .../moduletypes/TimeOfDayTrigger.json | 0 .../xml/internal/XmlBindingInfoProvider.java | 2 +- .../{ESH-INF => OH-INF}/i18n/units.properties | 0 .../i18n/units_de.properties | 0 .../i18n/validation.properties | 0 .../i18n/validation_de.properties | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../ConfigXmlConfigDescriptionProvider.java | 2 +- .../{ESH-INF => OH-INF}/config/config.xml | 0 .../config/brokerConnectionInstance.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../config/magicMultiAction.xml | 0 .../config/magicSingleAction.xml | 0 .../config/multipleConfig.xml | 0 .../i18n/magic_de.properties | 0 .../i18n/magic_en.properties | 0 .../thing/bridge-types.xml | 0 .../thing/channel-types.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../xml/internal/XmlThingTypeProvider.java | 2 +- .../{ESH-INF => OH-INF}/config/config.xml | 0 .../config/offsetProfile.xml | 0 .../i18n/DefaultSystemChannels_de.properties | 0 .../i18n/DefaultSystemChannels_fr.properties | 0 .../i18n/SystemProfiles_de.properties | 0 .../i18n/firmware.properties | 0 .../i18n/firmware_de.properties | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../i18n/LanguageResourceBundleManager.java | 2 +- .../{ESH-INF => OH-INF}/config/i18n.xml | 0 .../config/networkinterface.xml | 0 .../osgi/ResourceBundleClassLoaderTest.java | 8 ++++---- .../test/AutomationIntegrationJsonTest.java | 2 +- .../CustomActionsTypeDefinition.json | 0 .../CustomTriggersTypeDefinition.json | 0 .../automation/rules/ItemRuleDefinition.json | 0 .../templates/SimpleTestTemplate.json | 0 .../TestTemplateRuleWithReferences.json | 0 .../TestTemplateWithCompositeModules.json | 0 .../src/main/resources/fragment-tb1.jar | Bin 2647 -> 2743 bytes .../src/main/resources/fragment-tb2.jar | Bin 2691 -> 2787 bytes .../src/main/resources/host-tb1.jar | Bin 3047 -> 3149 bytes .../src/main/resources/host-tb2.jar | Bin 3077 -> 3179 bytes .../defaultscope/internal/ScopeTest.java | 2 +- .../automation/jsr223/scopeFailure.js | 0 .../automation/jsr223/scopeWorking.js | 0 .../automation/rules/DemoScriptRule.json | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../i18n/yahooweather_de.properties | 0 .../i18n/yahooweather_nl.properties | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/thing/MyThingType.xml | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../{ESH-INF => OH-INF}/i18n/test.properties | 0 .../i18n/test_de.properties | 0 .../{ESH-INF => OH-INF}/config/config.xml | 0 .../i18n/yahooweather_de.properties | 0 .../i18n/otherResourceName_en.properties | 0 .../i18n/resourceName.properties | 0 .../i18n/resourceName_en.properties | 0 .../i18n/resourceName_fr.properties | 0 .../i18n/firmware-test.properties | 0 .../i18n/firmware-test_de.properties | 0 .../i18n/thing-status.properties | 0 .../i18n/thing-status_de.properties | 0 .../i18n/test-translations.properties | 0 .../i18n/somebinding.properties | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../i18n/SystemChannels_de.properties | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../i18n/yahooweather_de.properties | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 .../META-INF/maven/archetype-metadata.xml | 2 +- .../resources/archetype-resources/README.md | 8 ++++---- .../{ESH-INF => OH-INF}/binding/binding.xml | 0 .../i18n/__bindingId___xx_XX.properties | 0 .../{ESH-INF => OH-INF}/thing/thing-types.xml | 0 116 files changed, 19 insertions(+), 19 deletions(-) rename bundles/org.openhab.core.audio/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.automation.module.script.rulesupport/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/PrivateScriptedTypes.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/ChannelTrigger.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/DayOfWeekCondition.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/EphemerisConditions.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/GenericConditions.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/GenericCronTrigger.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/GenericTriggers.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/ItemActions.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/ItemConditions.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/ItemTriggers.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/RuleEnablementAction.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/RunRuleAction.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/ThingTriggers.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/TimeOfDayCondition.json (100%) rename bundles/org.openhab.core.automation/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/TimeOfDayTrigger.json (100%) rename bundles/org.openhab.core.config.core/src/main/resources/{ESH-INF => OH-INF}/i18n/units.properties (100%) rename bundles/org.openhab.core.config.core/src/main/resources/{ESH-INF => OH-INF}/i18n/units_de.properties (100%) rename bundles/org.openhab.core.config.core/src/main/resources/{ESH-INF => OH-INF}/i18n/validation.properties (100%) rename bundles/org.openhab.core.config.core/src/main/resources/{ESH-INF => OH-INF}/i18n/validation_de.properties (100%) rename bundles/org.openhab.core.config.discovery/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.ephemeris/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.io.transport.mqtt/src/main/resources/{ESH-INF => OH-INF}/config/brokerConnectionInstance.xml (100%) rename bundles/org.openhab.core.karaf/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.model.lsp/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.model.script/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.persistence/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.storage.json/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/config/magicMultiAction.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/config/magicSingleAction.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/config/multipleConfig.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/i18n/magic_de.properties (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/i18n/magic_en.properties (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/thing/bridge-types.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/thing/channel-types.xml (100%) rename bundles/org.openhab.core.test.magic/src/main/resources/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/config/offsetProfile.xml (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/i18n/DefaultSystemChannels_de.properties (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/i18n/DefaultSystemChannels_fr.properties (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/i18n/SystemProfiles_de.properties (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/i18n/firmware.properties (100%) rename bundles/org.openhab.core.thing/src/main/resources/{ESH-INF => OH-INF}/i18n/firmware_de.properties (100%) rename bundles/org.openhab.core.ui/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core.voice/src/main/resources/{ESH-INF => OH-INF}/config/config.xml (100%) rename bundles/org.openhab.core/src/main/resources/{ESH-INF => OH-INF}/config/i18n.xml (100%) rename bundles/org.openhab.core/src/main/resources/{ESH-INF => OH-INF}/config/networkinterface.xml (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/CustomActionsTypeDefinition.json (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/moduletypes/CustomTriggersTypeDefinition.json (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/rules/ItemRuleDefinition.json (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/templates/SimpleTestTemplate.json (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/templates/TestTemplateRuleWithReferences.json (100%) rename itests/org.openhab.core.automation.integration.tests/src/main/resources/{ESH-INF => OH-INF}/automation/templates/TestTemplateWithCompositeModules.json (100%) rename itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/{ESH-INF => OH-INF}/automation/jsr223/scopeFailure.js (100%) rename itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/{ESH-INF => OH-INF}/automation/jsr223/scopeWorking.js (100%) rename itests/org.openhab.core.automation.module.script.tests/src/main/resources/{ESH-INF => OH-INF}/automation/rules/DemoScriptRule.json (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/BundleInfoTest.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/BundleInfoTest.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/i18n/yahooweather_de.properties (100%) rename itests/org.openhab.core.binding.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/i18n/yahooweather_nl.properties (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/{ESH-INF => OH-INF}/config/config.xml (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/{ESH-INF => OH-INF}/thing/MyThingType.xml (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{ESH-INF => OH-INF}/config/config.xml (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{ESH-INF => OH-INF}/i18n/test.properties (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{ESH-INF => OH-INF}/i18n/test_de.properties (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/config/config.xml (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/i18n/yahooweather_de.properties (100%) rename itests/org.openhab.core.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/otherResourceName_en.properties (100%) rename itests/org.openhab.core.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/resourceName.properties (100%) rename itests/org.openhab.core.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/resourceName_en.properties (100%) rename itests/org.openhab.core.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/resourceName_fr.properties (100%) rename itests/org.openhab.core.thing.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/firmware-test.properties (100%) rename itests/org.openhab.core.thing.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/firmware-test_de.properties (100%) rename itests/org.openhab.core.thing.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/thing-status.properties (100%) rename itests/org.openhab.core.thing.tests/src/main/resources/{ESH-INF => OH-INF}/i18n/thing-status_de.properties (100%) rename itests/org.openhab.core.thing.tests/src/main/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/{ESH-INF => OH-INF}/i18n/test-translations.properties (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/{ESH-INF => OH-INF}/i18n/somebinding.properties (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ChannelTypesTest.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannels.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannels.bundle/{ESH-INF => OH-INF}/i18n/SystemChannels_de.properties (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannels.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsUser.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/SystemChannelsUser.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ThingTypesTest.bundle/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ThingTypesTest.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/i18n/yahooweather_de.properties (100%) rename itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) rename tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/{ESH-INF => OH-INF}/binding/binding.xml (100%) rename tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/{ESH-INF => OH-INF}/i18n/__bindingId___xx_XX.properties (100%) rename tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/{ESH-INF => OH-INF}/thing/thing-types.xml (100%) diff --git a/bundles/org.openhab.core.audio/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.audio/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.audio/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.audio/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/resources/ESH-INF/automation/moduletypes/PrivateScriptedTypes.json b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/resources/OH-INF/automation/moduletypes/PrivateScriptedTypes.json similarity index 100% rename from bundles/org.openhab.core.automation.module.script.rulesupport/src/main/resources/ESH-INF/automation/moduletypes/PrivateScriptedTypes.json rename to bundles/org.openhab.core.automation.module.script.rulesupport/src/main/resources/OH-INF/automation/moduletypes/PrivateScriptedTypes.json diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java index 229f1afe87..3d9dca459d 100644 --- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java +++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java @@ -79,7 +79,7 @@ public abstract class AbstractResourceBundleProvider { * This static field provides a root directory for automation object resources in the bundle resources. * It is common for all resources - {@link ModuleType}s, {@link RuleTemplate}s and {@link Rule}s. */ - protected static final String ROOT_DIRECTORY = "ESH-INF/automation"; + protected static final String ROOT_DIRECTORY = "OH-INF/automation"; protected @Nullable ConfigI18nLocalizationService configI18nService; @@ -97,10 +97,10 @@ public abstract class AbstractResourceBundleProvider { * This field is initialized in constructors of any particular provider with specific path for the particular * resources from specific type as {@link ModuleType}s, {@link RuleTemplate}s and {@link Rule}s: *
  • for - * {@link ModuleType}s it is a "ESH-INF/automation/moduletypes/" + * {@link ModuleType}s it is a "OH-INF/automation/moduletypes/" *
  • for {@link RuleTemplate}s it is a - * "ESH-INF/automation/templates/" - *
  • for {@link Rule}s it is a "ESH-INF/automation/rules/" + * "OH-INF/automation/templates/" + *
  • for {@link Rule}s it is a "OH-INF/automation/rules/" */ protected final String path; diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ChannelTrigger.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ChannelTrigger.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/DayOfWeekCondition.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/DayOfWeekCondition.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/DayOfWeekCondition.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/DayOfWeekCondition.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/EphemerisConditions.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/EphemerisConditions.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/EphemerisConditions.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/EphemerisConditions.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericConditions.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericConditions.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericCronTrigger.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericCronTrigger.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericCronTrigger.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericCronTrigger.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericTriggers.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/GenericTriggers.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemActions.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemActions.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemActions.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemActions.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemConditions.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemConditions.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemConditions.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemConditions.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemTriggers.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ItemTriggers.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/RuleEnablementAction.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/RuleEnablementAction.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/RuleEnablementAction.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/RuleEnablementAction.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/RunRuleAction.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/RunRuleAction.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/RunRuleAction.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/RunRuleAction.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ThingTriggers.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/ThingTriggers.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/TimeOfDayCondition.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/TimeOfDayCondition.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/TimeOfDayCondition.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/TimeOfDayCondition.json diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/TimeOfDayTrigger.json b/bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/TimeOfDayTrigger.json similarity index 100% rename from bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/TimeOfDayTrigger.json rename to bundles/org.openhab.core.automation/src/main/resources/OH-INF/automation/moduletypes/TimeOfDayTrigger.json diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java index b81b5d704f..a41d8a66c7 100644 --- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java +++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java @@ -52,7 +52,7 @@ import org.osgi.service.component.annotations.Reference; public class XmlBindingInfoProvider extends AbstractXmlBasedProvider implements BindingInfoProvider, XmlDocumentProviderFactory { - private static final String XML_DIRECTORY = "/ESH-INF/binding/"; + private static final String XML_DIRECTORY = "/OH-INF/binding/"; public static final String READY_MARKER = "esh.xmlBindingInfo"; private final BindingI18nLocalizationService bindingI18nService; diff --git a/bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/units.properties b/bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/units.properties similarity index 100% rename from bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/units.properties rename to bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/units.properties diff --git a/bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/units_de.properties b/bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/units_de.properties similarity index 100% rename from bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/units_de.properties rename to bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/units_de.properties diff --git a/bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/validation.properties b/bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/validation.properties similarity index 100% rename from bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/validation.properties rename to bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/validation.properties diff --git a/bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/validation_de.properties b/bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/validation_de.properties similarity index 100% rename from bundles/org.openhab.core.config.core/src/main/resources/ESH-INF/i18n/validation_de.properties rename to bundles/org.openhab.core.config.core/src/main/resources/OH-INF/i18n/validation_de.properties diff --git a/bundles/org.openhab.core.config.discovery/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.config.discovery/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.config.discovery/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.config.discovery/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java index 3d100876a6..67f380c10a 100644 --- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java +++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java @@ -46,7 +46,7 @@ import org.osgi.service.component.annotations.Reference; public class ConfigXmlConfigDescriptionProvider extends AbstractXmlConfigDescriptionProvider implements XmlDocumentProviderFactory> { - private static final String XML_DIRECTORY = "/ESH-INF/config/"; + private static final String XML_DIRECTORY = "/OH-INF/config/"; public static final String READY_MARKER = "esh.xmlConfig"; private final ConfigI18nLocalizationService configI18nService; diff --git a/bundles/org.openhab.core.ephemeris/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.ephemeris/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.ephemeris/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.ephemeris/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/ESH-INF/config/brokerConnectionInstance.xml b/bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml similarity index 100% rename from bundles/org.openhab.core.io.transport.mqtt/src/main/resources/ESH-INF/config/brokerConnectionInstance.xml rename to bundles/org.openhab.core.io.transport.mqtt/src/main/resources/OH-INF/config/brokerConnectionInstance.xml diff --git a/bundles/org.openhab.core.karaf/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.karaf/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.karaf/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.karaf/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.model.lsp/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.model.lsp/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.model.lsp/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.model.script/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.model.script/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.model.script/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.model.script/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.persistence/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.persistence/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.persistence/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.persistence/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.storage.json/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.storage.json/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.storage.json/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.storage.json/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/binding/binding.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/binding/binding.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/binding/binding.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/magicMultiAction.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/magicMultiAction.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/magicMultiAction.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/magicMultiAction.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/magicSingleAction.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/magicSingleAction.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/magicSingleAction.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/magicSingleAction.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/multipleConfig.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/multipleConfig.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/multipleConfig.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/config/multipleConfig.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/i18n/magic_de.properties b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/i18n/magic_de.properties similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/i18n/magic_de.properties rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/i18n/magic_de.properties diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/i18n/magic_en.properties b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/i18n/magic_en.properties similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/i18n/magic_en.properties rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/i18n/magic_en.properties diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/bridge-types.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/bridge-types.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/bridge-types.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/bridge-types.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/channel-types.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/channel-types.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/channel-types.xml diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/thing-types.xml similarity index 100% rename from bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/thing/thing-types.xml rename to bundles/org.openhab.core.test.magic/src/main/resources/OH-INF/thing/thing-types.xml diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java index 35600af227..afb04d3588 100644 --- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java +++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java @@ -58,7 +58,7 @@ import org.osgi.service.component.annotations.Reference; public class XmlThingTypeProvider extends AbstractXmlBasedProvider implements ThingTypeProvider, XmlDocumentProviderFactory> { - private static final String XML_DIRECTORY = "/ESH-INF/thing/"; + private static final String XML_DIRECTORY = "/OH-INF/thing/"; public static final String READY_MARKER = "esh.xmlThingTypes"; private final ThingTypeI18nLocalizationService thingTypeI18nLocalizationService; diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/config/offsetProfile.xml b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/config/offsetProfile.xml similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/config/offsetProfile.xml rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/config/offsetProfile.xml diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/DefaultSystemChannels_de.properties b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_de.properties similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/DefaultSystemChannels_de.properties rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_de.properties diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/DefaultSystemChannels_fr.properties b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_fr.properties similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/DefaultSystemChannels_fr.properties rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/DefaultSystemChannels_fr.properties diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/SystemProfiles_de.properties b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/SystemProfiles_de.properties similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/SystemProfiles_de.properties rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/SystemProfiles_de.properties diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/firmware.properties b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/firmware.properties similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/firmware.properties rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/firmware.properties diff --git a/bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/firmware_de.properties b/bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/firmware_de.properties similarity index 100% rename from bundles/org.openhab.core.thing/src/main/resources/ESH-INF/i18n/firmware_de.properties rename to bundles/org.openhab.core.thing/src/main/resources/OH-INF/i18n/firmware_de.properties diff --git a/bundles/org.openhab.core.ui/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.ui/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.ui/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.ui/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core.voice/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.voice/src/main/resources/OH-INF/config/config.xml similarity index 100% rename from bundles/org.openhab.core.voice/src/main/resources/ESH-INF/config/config.xml rename to bundles/org.openhab.core.voice/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java index d6a24f42e3..98923175d2 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java @@ -40,7 +40,7 @@ import org.osgi.framework.Bundle; public class LanguageResourceBundleManager { /** The directory within the bundle where the resource files are searched. */ - protected static final String RESOURCE_DIRECTORY = "/ESH-INF/i18n"; + protected static final String RESOURCE_DIRECTORY = "/OH-INF/i18n"; /** The file pattern to filter out resource files. */ private static final String RESOURCE_FILE_PATTERN = "*.properties"; diff --git a/bundles/org.openhab.core/src/main/resources/ESH-INF/config/i18n.xml b/bundles/org.openhab.core/src/main/resources/OH-INF/config/i18n.xml similarity index 100% rename from bundles/org.openhab.core/src/main/resources/ESH-INF/config/i18n.xml rename to bundles/org.openhab.core/src/main/resources/OH-INF/config/i18n.xml diff --git a/bundles/org.openhab.core/src/main/resources/ESH-INF/config/networkinterface.xml b/bundles/org.openhab.core/src/main/resources/OH-INF/config/networkinterface.xml similarity index 100% rename from bundles/org.openhab.core/src/main/resources/ESH-INF/config/networkinterface.xml rename to bundles/org.openhab.core/src/main/resources/OH-INF/config/networkinterface.xml diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java index 089765fef8..63c1c561d8 100644 --- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java +++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java @@ -47,18 +47,18 @@ public class ResourceBundleClassLoaderTest { @Test public void testName() throws Exception { Path tmp = Files.createTempDirectory("tmp"); - URL hostPropertiesURL = createTmpTestPropetiesFile(tmp, "host/ESH-INF/i18n/test.properties"); - URL fragmentPropertiesURL = createTmpTestPropetiesFile(tmp, "fragment/ESH-INF/i18n/test.properties"); + URL hostPropertiesURL = createTmpTestPropetiesFile(tmp, "host/OH-INF/i18n/test.properties"); + URL fragmentPropertiesURL = createTmpTestPropetiesFile(tmp, "fragment/OH-INF/i18n/test.properties"); Bundle bundleMock = mock(Bundle.class); when(bundleMock.findEntries(any(), any(), anyBoolean())) .thenAnswer(answer -> Collections.enumeration(Arrays.asList(hostPropertiesURL, fragmentPropertiesURL))); when(bundleMock.getEntry(any())).thenReturn(hostPropertiesURL); - ResourceBundleClassLoader classloader = new ResourceBundleClassLoader(bundleMock, "/ESH-INF/i18n", + ResourceBundleClassLoader classloader = new ResourceBundleClassLoader(bundleMock, "/OH-INF/i18n", "*.properties"); - List propertiesURLs = Collections.list(bundleMock.findEntries("/ESH-INF/i18n", "*.properties", true)); + List propertiesURLs = Collections.list(bundleMock.findEntries("/OH-INF/i18n", "*.properties", true)); assertEquals(2, propertiesURLs.size()); assertTrue(propertiesURLs.contains(hostPropertiesURL)); diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java index 9f49cf3526..cf793dbec6 100644 --- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java +++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java @@ -62,7 +62,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * This tests the RuleEngineImpl and the import from JSON resources contained in the ESH-INF folder. + * This tests the RuleEngineImpl and the import from JSON resources contained in the OH-INF folder. * This test must be run first otherwise imported rules will be cleared. * * @author Benedikt Niehues - Initial contribution diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/moduletypes/CustomActionsTypeDefinition.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/moduletypes/CustomActionsTypeDefinition.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/rules/ItemRuleDefinition.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/rules/ItemRuleDefinition.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/SimpleTestTemplate.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/SimpleTestTemplate.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/TestTemplateRuleWithReferences.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/TestTemplateRuleWithReferences.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/TestTemplateWithCompositeModules.json similarity index 100% rename from itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/OH-INF/automation/templates/TestTemplateWithCompositeModules.json diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/fragment-tb1.jar b/itests/org.openhab.core.automation.integration.tests/src/main/resources/fragment-tb1.jar index 82c6303678741712f4435a3aeedb79fa74609221..af9e1639317cde9956f719bf7985ac0f36ea83a5 100644 GIT binary patch delta 1106 zcmcaEvR!n7)a0qG%Hj+R91LG)9`p#bN!@mofq|i%k%2*kL13~1m-ysotXC&8NvN|k z$T0YO=z99O>4%1JGBA5+c!VGG&5tOp;AUWC5mIMhV95d!6QqoU5GoT(OY(CQOEUBG z2xwxJ18JK4kX_aqpXmYK%q${6_i-=?&e`p8RK-R}73k8V%nS_HQ2o|YAjfTL@dyWD zRL5=BWz=Alg_-bc_HGZ2^=}OB0?pe7G{q9;g2@Y*WWc6$08Id4R8uCOVtN1!5N{rY zH!}?_@Ou#9?xSvMUeD$DS(Aab-U4DBh^;JglMOiez_uy^0~LhPZ1rVHgF8KA?rx8{ zKYuLn2O5x$WQY#f0F!o)@Ejj32FOjeWHp(*iBp4#fno9;PI*R#$$vN%namj`%X6tP zGcw6d7GM`QV`q>68VLdd3~wFnfFT2qc2-EVqq>YCz#FR7Q3yqAJwhu=Iv`+*upEjh zr$MHG5{7$d2p*lxxRM3LGeAQa-Zm-&Jq|L<+6`nBW&(kD1!@##`am{nFEGu4odrrQ zG9cqHQwkzvQh8AP#LEf~RA|y6>@&=SgY2AOkcpEYLXr{KcbG{C#dnxV2-!FpHi&UL ax*(r{5)?+9vjUYcFmM6k1z=EI1oHs1quRj$ delta 970 zcmdlkdR=6Klne)h0E26=hpwlen|^2n55qCv{0I*XkMOUIA`BCx)P<3x6H80-a}!H4 z^YgH%WRnN0oP38_)&Sj{0B>d%5e5z*6r8i$g8>QHz%@;dXOiOs+P|sABOHW*_HUlf zq`|1i&T&-5Mo5*Bf#E1K0|UaSU$aq-vVs|92{NVwXaooYjhU>^@_>(>Lu36LgS$Yh zw*gI>Amzx5D23?3vaa?kfC$RE?Y*PdV8VG}IYh;s~e2vuu z=3agd;~Hsu>4az;2G?(gC>{7X3gsYcW-`PX5a#&&V-ZmR*r)6YFFL Vb`=p;Hefh0Z~IQbjv$B9f5>g)_M4E`Rvo_=on zp&^_M%uyO1;b(mFBT6f{85miF)EO99vVg<{DI+0-%EZ!={M^Kn%=|n8npovPnkMsd z$XeqwJ;0lpMFi+94hEY!yFCI+*Tv~EGBBKFW?-;}>bI5xIgX{(BOHWL9k*GR(U4IV zW`aM^gt`?|zdiw)r^m#=Uk1nx(NUrEr&DN!#u5K(eAX253ej z5JSz-0qZYN_Xsz`reAJy1gqoZdz>0TzfR`hl4oR?tih$oWX>?zn@fe6kx6dyLr!rs zb_NNci69`r@Yc}|=t6j;vqB;r)nN<)-cYTMLMU465n54F0RdBlcU9UiKQj^xrrs2 z`FU7WvdM#0PJYEGr;lb#fHyOX2m=QY+RWMQ!GHv8V0vUH$1}>PC~rha__ zv|f*i0q8eJUL?O|8d_lb3Srw_H#ILLcQfchY>Q%(o4kOP4`f>)Fx)^GWZMFu@H5tM zpxaZFP5%`EH5vfjk1*{@8fq}WP16CHWCk>)Kpo=l1#Iy^cR!Gj6jW<-o5N1zR|{>CFP{owc) z0h$4ef4CWw6*+}PtWb320He<}7-*~PWMEWt19ico8sx-iUS!3NCxEF2mcF5pjNPT6 zC`OJhU1Vb#nOVSgLL(gHTUdm{T?&j9P{blf7OEK!U}orm+zg9mpqsUrma|UQWS3{; fnC!`}$aIf&at^zS2rC;fbQrjRumb3ZuV5YkWFXAz diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/resources/host-tb1.jar b/itests/org.openhab.core.automation.integration.tests/src/main/resources/host-tb1.jar index 7b6946a1bb448fce5d4e815053062de626c6464d..14956688add1c793e29423ab5678ef5ecff79549 100644 GIT binary patch delta 1250 zcmaiy-%FEW6vxl|YjeCJYp%A2dqp;!2sY~?7gm(ee00_%CR3C^NW`et#e}+w=&}Oi zp`yF}2L(kJ{-lfaN)f#BMkI)?1gkp*@tpT{+xzs?wsBqu*|@GVa) z1keCm@4vEFq3)|+0N|nm5ClK}Xoh&)yZTxUC%n)CS=KdhE1ew4`9N#xVEN^nh0)o^ zCMbF!0ifT*$6Vw>p!(+IY_afQvN%(CSf|ObsEPZ1(cW70;f$sSF<%2bA75anHs*Kc z@z-xmn>y)FMJQZ*Gs{zn;drOA6fFbZAmH2WE8THyUef@2%K>=FXW5WJ1W<{PPj}RW zQlWgFSYYYQ($RN}kyHULRVbTUi%q$En&qiP3O~?(;8in?^uBY|ne(aISE?@mC*3|c z@Z#)l5vOJ`f6SiBjF>&~3H~coe@)DKEdI_It3>ZCEwh!~Qf>?(Z?PPR<#8bUPlxi; z|AI{LKC=Ti<@e221^7#|P3-~x!HnyQYH9qJex}C@VdT-r4|~^>7_cIa;fNzfgW*iM zw=W>{KC1Q#D%Ha@TLNa0FeF$1NUm1v|I~8UK?v+U3*zp?N~H-UOLnr1gOVk4qpqQL zb}UlP#>u(~IN3HgZd)(o(7h<7lf84Dda6;l(K!!x3ntdTlr@mzd@lne)h0E26=hpwlen|^2n55qp+{0Ke`kMOUIA`BCx)P<3x6H80-a}!H4 z^YgH%WRnN0oSeWZr;lb#fHyOX2m=QYHb?LFU_b(vFg>!91DK@wfcn&gJ;Fg4X#M0? zroDRX9D?U|-P;A!^NEpx0b$ZqG?Q!)CdG5fflTrOngYT=lQwT*R%Zknbu`GM_#ZNNFZh! zT406`!r`CY)Vz>FfI$Uf+Z1kPkWH1q&c(f^S!J4dg$ zf!#Ks5;L%6j7*}FCvu33axm}!#lXPfts{sACYs5*9O9EFafqo1qsW>;WWh-ak!B_v zatMPIi^!uWE(a?HC7a2{9Ksr~RDvAqmdF|!kH9p5(~NZl2RzLLcmrL_3`uFA^no1R zHYjF%1^Uf37-*^NWMFCmnE^{J$Yy{N269AOp_nlln24Ze0F#LT&nzhKMNG!=N;Q9LFli+8Q-j!4?5i2*{zZ6oTwfP)b0KT~z)5Ao_vn z0^~?ox_~=!vN#7H(@wU@>KyWn9FyHS6q!D-P0r#_5n*KmhBN~=5Z(lO^#?nM2LK=L Bg)_M4E`Rvo_=on zp&^_M%tjg>;p=?!BT6f{85miF)EO99vVg<{DI+0-%EZ!={M^Kn%=|n8npovPnkFyg zl(oiZdVn`GiwMwJ91OKFyFCQY?Yg%M$os^|z+eH>KiQj8S_HSmCMR%-o3S%U0F46y0fx7ZIzacq z(+w*m-JrUPA;24|)lmpVYc4`7NP~o>KY5oWx#|d19BN= zqC*69Di2B!X|Vw{qohK@0fm_ck)2ZjGI26AMS^{YnHo`ihnX6YjSFLk7^kcY@);;? WVk99}pp6U++(2jp3<^mO5Dx%IH}X*c delta 1121 zcmaDY(JC=PN``|$fWbA`L)X*KO+Pe(hhd#>euR;RNBCDp5rzp;>cU9UiKQj^xrrs2 z`FU7WvdM#0PJYNGYk+P}fHyOX2m=QY*2e7iU_b(va7~l{b4v38?f)m@5e~vY`zJRs z?bT!F5Inc*-Y%e?PmBx<2$QCxnPh`7sg_F)WRjk!M>q%rP1?MXS)CDR)X^YY0~Me# z$C;6hx`Aet70f70kTENOMu0HLK_0A6_}DoV3=9uG1Ukr&i2)cyj=W&ykPyr?w7?7; zgrnKr)x3~=&!7Uash>?5WYaug(1S3@rZa3kK=-b9c>kdjsNoKZ*O#>HM+ro@DWa1N zc=$jj)dEeKvd|ao=1uIGKsR5$sUVmJG-)poPp}mN#l_>92a$}K=zm{?okQe8%ZklF zC1zj?8JR?xCl@k`>2NUc00qIo;jJTxMkE;yc#;Y5hG{StM$uq~qyZ%nVbd!jkD|96 ztQVB5CI@hcXuuK?a-y(A*3ftap#hkrtRpz!NebdVNJ0c9ALP_vgJQ;4p!Z#a!IlCO z6UYo$VnQ|plx~pIf)$DxlYwarY=)&EP(LgcA;L(G7g@RE8x};Mf>P0Be-2TwZ$W7W zIUT4VYim?z1=|8lK_FMcQV_B$L8%2f_EGf - src/main/resources/ESH-INF + src/main/resources/OH-INF **/*.* diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/README.md b/tools/archetype/binding/src/main/resources/archetype-resources/README.md index 2c48f1ff3a..d4587989c7 100644 --- a/tools/archetype/binding/src/main/resources/archetype-resources/README.md +++ b/tools/archetype/binding/src/main/resources/archetype-resources/README.md @@ -8,7 +8,7 @@ _If possible, provide some resources like pictures, a YouTube video, etc. to giv _Please describe the different supported things / devices within this section._ _Which different types are supported, which models were tested etc.?_ -_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/ESH-INF/thing``` of your binding._ +_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/OH-INF/thing``` of your binding._ #[[##]]# Discovery @@ -27,7 +27,7 @@ _If your binding requires or supports general configuration settings, please cre secret=openHABSecret ``` -_Note that it is planned to generate some part of this based on the information that is available within ```src/main/resources/ESH-INF/binding``` of your binding._ +_Note that it is planned to generate some part of this based on the information that is available within ```src/main/resources/OH-INF/binding``` of your binding._ _If your binding does not offer any generic configurations, you can remove this section completely._ @@ -35,13 +35,13 @@ _If your binding does not offer any generic configurations, you can remove this _Describe what is needed to manually configure a thing, either through the (Paper) UI or via a thing-file. This should be mainly about its mandatory and optional configuration parameters. A short example entry for a thing file can help!_ -_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/ESH-INF/thing``` of your binding._ +_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/OH-INF/thing``` of your binding._ #[[##]]# Channels _Here you should provide information about available channel types, what their meaning is and how they can be used._ -_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/ESH-INF/thing``` of your binding._ +_Note that it is planned to generate some part of this based on the XML files within ```src/main/resources/OH-INF/thing``` of your binding._ | channel | type | description | |----------|--------|------------------------------| diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/binding/binding.xml b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/binding/binding.xml similarity index 100% rename from tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/binding/binding.xml rename to tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/binding/binding.xml diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/i18n/__bindingId___xx_XX.properties b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/i18n/__bindingId___xx_XX.properties similarity index 100% rename from tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/i18n/__bindingId___xx_XX.properties rename to tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/i18n/__bindingId___xx_XX.properties diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/thing/thing-types.xml b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/thing/thing-types.xml similarity index 100% rename from tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/ESH-INF/thing/thing-types.xml rename to tools/archetype/binding/src/main/resources/archetype-resources/src/main/resources/OH-INF/thing/thing-types.xml