[openhab.core] Split: Storage+Auth+Persistence

Signed-off-by: David Graeff <david.graeff@web.de>
openhab · Apr 10, 2019 · 0b28574 · 0b28574
1 parent ff158f9
commit 0b28574
Show file tree

Hide file tree

Showing 65 changed files with 311 additions and 11 deletions.
diff --git a/bundles/org.openhab.core.authentication/.classpath b/bundles/org.openhab.core.authentication/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.openhab.core.authentication/.project b/bundles/org.openhab.core.authentication/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.openhab.core.authentication</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.openhab.core.authentication/NOTICE b/bundles/org.openhab.core.authentication/NOTICE
@@ -0,0 +1,13 @@
+This content is produced and maintained by the openHAB project.
+
+* Project home: https://www.openhab.org
+
+== Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0/.
+
+== Source Code
+
+https://github.com/openhab/openhab2-addons
diff --git a/bundles/org.openhab.core.authentication/pom.xml b/bundles/org.openhab.core.authentication/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.reactor.bundles</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.openhab.core.authentication</artifactId>
+
+ <name>openHAB Core :: Bundles :: Authentication</name>
+</project>
diff --git a/...e/smarthome/core/auth/Authentication.java → ...e/smarthome/core/auth/Authentication.java b/...e/smarthome/core/auth/Authentication.java → ...e/smarthome/core/auth/Authentication.java
diff --git a/...me/core/auth/AuthenticationException.java → ...me/core/auth/AuthenticationException.java b/...me/core/auth/AuthenticationException.java → ...me/core/auth/AuthenticationException.java
diff --git a/...home/core/auth/AuthenticationManager.java → ...home/core/auth/AuthenticationManager.java b/...home/core/auth/AuthenticationManager.java → ...home/core/auth/AuthenticationManager.java
diff --git a/...ome/core/auth/AuthenticationProvider.java → ...ome/core/auth/AuthenticationProvider.java b/...ome/core/auth/AuthenticationProvider.java → ...ome/core/auth/AuthenticationProvider.java
diff --git a/...ipse/smarthome/core/auth/Credentials.java → ...ipse/smarthome/core/auth/Credentials.java b/...ipse/smarthome/core/auth/Credentials.java → ...ipse/smarthome/core/auth/Credentials.java
diff --git a/...org/eclipse/smarthome/core/auth/Role.java → ...org/eclipse/smarthome/core/auth/Role.java b/...org/eclipse/smarthome/core/auth/Role.java → ...org/eclipse/smarthome/core/auth/Role.java
diff --git a/...marthome/core/auth/SecurityException.java → ...marthome/core/auth/SecurityException.java b/...marthome/core/auth/SecurityException.java → ...marthome/core/auth/SecurityException.java
diff --git a/...auth/UnsupportedCredentialsException.java → ...auth/UnsupportedCredentialsException.java b/...auth/UnsupportedCredentialsException.java → ...auth/UnsupportedCredentialsException.java
diff --git a/...ore/auth/UsernamePasswordCredentials.java → ...ore/auth/UsernamePasswordCredentials.java b/...ore/auth/UsernamePasswordCredentials.java → ...ore/auth/UsernamePasswordCredentials.java
diff --git a/...nt/oauth2/AccessTokenRefreshListener.java → ...nt/oauth2/AccessTokenRefreshListener.java b/...nt/oauth2/AccessTokenRefreshListener.java → ...nt/oauth2/AccessTokenRefreshListener.java
diff --git a/...th/client/oauth2/AccessTokenResponse.java → ...th/client/oauth2/AccessTokenResponse.java b/...th/client/oauth2/AccessTokenResponse.java → ...th/client/oauth2/AccessTokenResponse.java
diff --git a/...uth/client/oauth2/OAuthClientService.java → ...uth/client/oauth2/OAuthClientService.java b/...uth/client/oauth2/OAuthClientService.java → ...uth/client/oauth2/OAuthClientService.java
diff --git a/...re/auth/client/oauth2/OAuthException.java → ...re/auth/client/oauth2/OAuthException.java b/...re/auth/client/oauth2/OAuthException.java → ...re/auth/client/oauth2/OAuthException.java
diff --git a/...core/auth/client/oauth2/OAuthFactory.java → ...core/auth/client/oauth2/OAuthFactory.java b/...core/auth/client/oauth2/OAuthFactory.java → ...core/auth/client/oauth2/OAuthFactory.java
diff --git a/...client/oauth2/OAuthResponseException.java → ...client/oauth2/OAuthResponseException.java b/...client/oauth2/OAuthResponseException.java → ...client/oauth2/OAuthResponseException.java
diff --git a/...ore/auth/client/oauth2/StorageCipher.java → ...ore/auth/client/oauth2/StorageCipher.java b/...ore/auth/client/oauth2/StorageCipher.java → ...ore/auth/client/oauth2/StorageCipher.java
diff --git a/...ernal/auth/AuthenticationManagerImpl.java → ...ernal/auth/AuthenticationManagerImpl.java b/...ernal/auth/AuthenticationManagerImpl.java → ...ernal/auth/AuthenticationManagerImpl.java
diff --git a/bundles/org.openhab.core.config.core/pom.xml b/bundles/org.openhab.core.config.core/pom.xml
@@ -19,6 +19,11 @@
  <artifactId>org.openhab.core</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.io.net</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  </dependencies>
 
 </project>
diff --git a/...lipse/smarthome/core/net/CidrAddress.java → ...lipse/smarthome/core/net/CidrAddress.java b/...lipse/smarthome/core/net/CidrAddress.java → ...lipse/smarthome/core/net/CidrAddress.java
diff --git a/...e/smarthome/core/net/HttpServiceUtil.java → ...e/smarthome/core/net/HttpServiceUtil.java b/...e/smarthome/core/net/HttpServiceUtil.java → ...e/smarthome/core/net/HttpServiceUtil.java
diff --git a/...g/eclipse/smarthome/core/net/NetUtil.java → ...g/eclipse/smarthome/core/net/NetUtil.java b/...g/eclipse/smarthome/core/net/NetUtil.java → ...g/eclipse/smarthome/core/net/NetUtil.java
diff --git a/...ore/net/NetworkAddressChangeListener.java → ...ore/net/NetworkAddressChangeListener.java b/...ore/net/NetworkAddressChangeListener.java → ...ore/net/NetworkAddressChangeListener.java
diff --git a/...thome/core/net/NetworkAddressService.java → ...thome/core/net/NetworkAddressService.java b/...thome/core/net/NetworkAddressService.java → ...thome/core/net/NetworkAddressService.java
diff --git a/bundles/org.openhab.core.io.rest.core/pom.xml b/bundles/org.openhab.core.io.rest.core/pom.xml
@@ -14,6 +14,11 @@
  <name>openHAB Core :: Bundles :: REST Interface</name>
 
  <dependencies>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.authentication</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.core.bundles</groupId>
  <artifactId>org.openhab.core.transform</artifactId>

diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
@@ -29,6 +29,11 @@
  <artifactId>org.openhab.core.transform</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.persistence</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.core.bundles</groupId>
  <artifactId>org.openhab.core.voice</artifactId>

diff --git a/bundles/org.openhab.core.persistence.rest/.classpath b/bundles/org.openhab.core.persistence.rest/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.openhab.core.persistence.rest/.project b/bundles/org.openhab.core.persistence.rest/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.openhab.core.persistence.rest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.openhab.core.persistence.rest/NOTICE b/bundles/org.openhab.core.persistence.rest/NOTICE
@@ -0,0 +1,14 @@
+This content is produced and maintained by the openHAB project.
+
+* Project home: https://www.openhab.org
+
+== Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0/.
+
+== Source Code
+
+https://github.com/openhab/openhab-core
+
diff --git a/bundles/org.openhab.core.persistence.rest/pom.xml b/bundles/org.openhab.core.persistence.rest/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.reactor.bundles</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.openhab.core.persistence.rest</artifactId>
+
+ <name>openHAB Core :: Bundles :: Persistence :: REST</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.persistence</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.authentication</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.io.rest</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/...rnal/persistence/PersistenceResource.java → ...rnal/persistence/PersistenceResource.java b/...rnal/persistence/PersistenceResource.java → ...rnal/persistence/PersistenceResource.java
diff --git a/bundles/org.openhab.core.persistence/pom.xml b/bundles/org.openhab.core.persistence/pom.xml
@@ -19,6 +19,11 @@
  <artifactId>org.openhab.core.config.core</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.scheduler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  </dependencies>
 
 </project>
diff --git a/.../core/persistence/ItemHistoryListDTO.java → ...e/persistence/dto/ItemHistoryListDTO.java b/.../core/persistence/ItemHistoryListDTO.java → ...e/persistence/dto/ItemHistoryListDTO.java
@@ -10,14 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.persistence;
+package org.eclipse.smarthome.core.persistence.dto;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO;
-
 /**
  * This is a java bean that is used to serialize item lists.
  *

diff --git a/...nce/extensions/PersistenceExtensions.java → ...nce/extensions/PersistenceExtensions.java b/...nce/extensions/PersistenceExtensions.java → ...nce/extensions/PersistenceExtensions.java
@@ -24,11 +24,11 @@
 import org.eclipse.smarthome.core.items.Item;
 import org.eclipse.smarthome.core.library.types.DecimalType;
 import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
 import org.eclipse.smarthome.core.persistence.HistoricItem;
 import org.eclipse.smarthome.core.persistence.PersistenceService;
 import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
 import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
+import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
 import org.eclipse.smarthome.core.types.State;
 import org.joda.time.DateTime;
 import org.joda.time.base.AbstractInstant;

diff --git a/bundles/org.openhab.core.scheduler/.classpath b/bundles/org.openhab.core.scheduler/.classpath
@@ -16,11 +16,6 @@
  <attribute name="maven.pomderived" value="true"/>
  </attributes>
  </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
  <classpathentry kind="src" output="target/test-classes" path="src/test/java">
  <attributes>
  <attribute name="optional" value="true"/>

diff --git a/bundles/org.openhab.core.scheduler/pom.xml b/bundles/org.openhab.core.scheduler/pom.xml
@@ -13,4 +13,12 @@
 
  <name>openHAB Core :: Bundles :: Scheduler Service</name>
 
+ <dependencies>
+ <dependency>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
 </project>
diff --git a/...core/internal/scheduler/CronAdjuster.java → ...core/internal/scheduler/CronAdjuster.java b/...core/internal/scheduler/CronAdjuster.java → ...core/internal/scheduler/CronAdjuster.java
diff --git a/...internal/scheduler/CronSchedulerImpl.java → ...internal/scheduler/CronSchedulerImpl.java b/...internal/scheduler/CronSchedulerImpl.java → ...internal/scheduler/CronSchedulerImpl.java
diff --git a/...nal/scheduler/DelegatedSchedulerImpl.java → ...nal/scheduler/DelegatedSchedulerImpl.java b/...nal/scheduler/DelegatedSchedulerImpl.java → ...nal/scheduler/DelegatedSchedulerImpl.java
diff --git a/.../internal/scheduler/PeriodicAdjuster.java → .../internal/scheduler/PeriodicAdjuster.java b/.../internal/scheduler/PeriodicAdjuster.java → .../internal/scheduler/PeriodicAdjuster.java
diff --git a/...rnal/scheduler/PeriodicSchedulerImpl.java → ...rnal/scheduler/PeriodicSchedulerImpl.java b/...rnal/scheduler/PeriodicSchedulerImpl.java → ...rnal/scheduler/PeriodicSchedulerImpl.java
diff --git a/...cheduler/internal/SchedulerActivator.java → ...nternal/scheduler/SchedulerActivator.java b/...cheduler/internal/SchedulerActivator.java → ...nternal/scheduler/SchedulerActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler.internal;
+package org.eclipse.smarthome.core.internal.scheduler;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

diff --git a/...ore/internal/scheduler/SchedulerImpl.java → ...ore/internal/scheduler/SchedulerImpl.java b/...ore/internal/scheduler/SchedulerImpl.java → ...ore/internal/scheduler/SchedulerImpl.java
diff --git a/...pse/smarthome/core/scheduler/CronJob.java → ...pse/smarthome/core/scheduler/CronJob.java b/...pse/smarthome/core/scheduler/CronJob.java → ...pse/smarthome/core/scheduler/CronJob.java
diff --git a/...arthome/core/scheduler/CronScheduler.java → ...arthome/core/scheduler/CronScheduler.java b/...arthome/core/scheduler/CronScheduler.java → ...arthome/core/scheduler/CronScheduler.java
diff --git a/...ome/core/scheduler/PeriodicScheduler.java → ...ome/core/scheduler/PeriodicScheduler.java b/...ome/core/scheduler/PeriodicScheduler.java → ...ome/core/scheduler/PeriodicScheduler.java
diff --git a/...scheduler/ScheduledCompletableFuture.java → ...scheduler/ScheduledCompletableFuture.java b/...scheduler/ScheduledCompletableFuture.java → ...scheduler/ScheduledCompletableFuture.java
diff --git a/...e/smarthome/core/scheduler/Scheduler.java → ...e/smarthome/core/scheduler/Scheduler.java b/...e/smarthome/core/scheduler/Scheduler.java → ...e/smarthome/core/scheduler/Scheduler.java
diff --git a/...ome/core/scheduler/SchedulerRunnable.java → ...ome/core/scheduler/SchedulerRunnable.java b/...ome/core/scheduler/SchedulerRunnable.java → ...ome/core/scheduler/SchedulerRunnable.java
diff --git a/.../scheduler/SchedulerTemporalAdjuster.java → .../scheduler/SchedulerTemporalAdjuster.java b/.../scheduler/SchedulerTemporalAdjuster.java → .../scheduler/SchedulerTemporalAdjuster.java
diff --git a/bundles/org.openhab.core.scheduler/src/main/resources/readme.txt b/bundles/org.openhab.core.scheduler/src/main/resources/readme.txt
diff --git a/bundles/org.openhab.core.storage/.classpath b/bundles/org.openhab.core.storage/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.openhab.core.storage/.project b/bundles/org.openhab.core.storage/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.openhab.core.storage</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.openhab.core.storage/NOTICE b/bundles/org.openhab.core.storage/NOTICE
@@ -0,0 +1,14 @@
+This content is produced and maintained by the openHAB project.
+
+* Project home: https://www.openhab.org
+
+== Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License 2.0 which is available at
+https://www.eclipse.org/legal/epl-2.0/.
+
+== Source Code
+
+https://github.com/openhab/openhab-core
+
diff --git a/bundles/org.openhab.core.storage/pom.xml b/bundles/org.openhab.core.storage/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.openhab.core.bundles</groupId>
+ <artifactId>org.openhab.core.reactor.bundles</artifactId>
+ <version>2.5.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.openhab.core.storage</artifactId>
+
+ <name>openHAB Core :: Bundles :: Storage</name>
+</project>
diff --git a/...rthome/core/storage/DeletableStorage.java → ...rthome/core/storage/DeletableStorage.java b/...rthome/core/storage/DeletableStorage.java → ...rthome/core/storage/DeletableStorage.java
diff --git a/...core/storage/DeletableStorageService.java → ...core/storage/DeletableStorageService.java b/...core/storage/DeletableStorageService.java → ...core/storage/DeletableStorageService.java
diff --git a/...lipse/smarthome/core/storage/Storage.java → ...lipse/smarthome/core/storage/Storage.java b/...lipse/smarthome/core/storage/Storage.java → ...lipse/smarthome/core/storage/Storage.java
diff --git a/...marthome/core/storage/StorageService.java → ...marthome/core/storage/StorageService.java b/...marthome/core/storage/StorageService.java → ...marthome/core/storage/StorageService.java
diff --git a/bundles/org.openhab.core/README.md b/bundles/org.openhab.core/README.md
@@ -0,0 +1,6 @@
+# openHAB core bundle
+
+This bundle provides core services and defines
+openHAB "Items", "Item states", "Item Commands" and "Item types".
+
+Some utility methods for OSGI are also available.