[zoneminder] Made constants and handler packages ineternal (openhab#4037

) Signed-off-by: VelinYordanov <[email protected]> Signed-off-by: Pshatsillo <[email protected]>
Pshatsillo · Jun 19, 2019 · 733de6d · 733de6d
1 parent df3451d
commit 733de6d
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 26 deletions.
diff --git a/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF
@@ -15,9 +15,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.binding.zoneminder;singleton:=true
 Bundle-Vendor: openHAB
 Bundle-Version: 2.5.0.qualifier
-Export-Package: 
- org.openhab.binding.zoneminder,
- org.openhab.binding.zoneminder.handler
 Import-Package: 
  com.google.common.collect,
  javax.ws.rs.client,
@@ -33,8 +30,6 @@ Import-Package:
  org.eclipse.smarthome.core.thing.binding.builder,
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
- org.openhab.binding.zoneminder,
- org.openhab.binding.zoneminder.handler,
  org.osgi.framework,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
diff --git a/...nding/zoneminder/ZoneMinderConstants.java → ...eminder/internal/ZoneMinderConstants.java b/...nding/zoneminder/ZoneMinderConstants.java → ...eminder/internal/ZoneMinderConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder;
+package org.openhab.binding.zoneminder.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.smarthome.core.thing.ThingTypeUID;

diff --git a/...inder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java b/...inder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java
@@ -20,9 +20,8 @@
 import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
 import org.eclipse.smarthome.core.thing.binding.ThingHandler;
 import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
-import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler;
-import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler;
+import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler;
+import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ding/zoneminder/ZoneMinderProperties.java → ...minder/internal/ZoneMinderProperties.java b/...ding/zoneminder/ZoneMinderProperties.java → ...minder/internal/ZoneMinderProperties.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder;
+package org.openhab.binding.zoneminder.internal;
 
 /**
  *

diff --git a/...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java b/...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.zoneminder.internal.config;
 
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
 
 /**
  * Configuration data according to zoneminderserver.xml

diff --git a/...r/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java b/...r/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.zoneminder.internal.config;
 
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
 
 /**
  * Monitor configuration from openHAB.

diff --git a/...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java b/...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.zoneminder.internal.config;
 
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
 
 /**
  * Specific configuration class for Monitor COnfig.

diff --git a/...in/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java b/...in/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java
@@ -23,9 +23,9 @@
 import org.eclipse.smarthome.config.discovery.ExtendedDiscoveryService;
 import org.eclipse.smarthome.core.thing.ThingTypeUID;
 import org.eclipse.smarthome.core.thing.ThingUID;
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
-import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler;
-import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler;
+import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...r/handler/ZoneMinderBaseThingHandler.java → ...l/handler/ZoneMinderBaseThingHandler.java b/...r/handler/ZoneMinderBaseThingHandler.java → ...l/handler/ZoneMinderBaseThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder.handler;
+package org.openhab.binding.zoneminder.internal.handler;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -33,8 +33,8 @@
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.UnDefType;
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
 import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
 import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...zoneminder/handler/ZoneMinderHandler.java → ...r/internal/handler/ZoneMinderHandler.java b/...zoneminder/handler/ZoneMinderHandler.java → ...r/internal/handler/ZoneMinderHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder.handler;
+package org.openhab.binding.zoneminder.internal.handler;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

diff --git a/...andler/ZoneMinderServerBridgeHandler.java → ...andler/ZoneMinderServerBridgeHandler.java b/...andler/ZoneMinderServerBridgeHandler.java → ...andler/ZoneMinderServerBridgeHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder.handler;
+package org.openhab.binding.zoneminder.internal.handler;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -43,9 +43,9 @@
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.UnDefType;
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
-import org.openhab.binding.zoneminder.ZoneMinderProperties;
 import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.ZoneMinderProperties;
 import org.openhab.binding.zoneminder.internal.config.ZoneMinderBridgeServerConfig;
 import org.openhab.binding.zoneminder.internal.discovery.ZoneMinderDiscoveryService;
 import org.osgi.framework.ServiceRegistration;

diff --git a/...andler/ZoneMinderThingMonitorHandler.java → ...andler/ZoneMinderThingMonitorHandler.java b/...andler/ZoneMinderThingMonitorHandler.java → ...andler/ZoneMinderThingMonitorHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder.handler;
+package org.openhab.binding.zoneminder.internal.handler;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -34,9 +34,9 @@
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.UnDefType;
-import org.openhab.binding.zoneminder.ZoneMinderConstants;
-import org.openhab.binding.zoneminder.ZoneMinderProperties;
 import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
+import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
+import org.openhab.binding.zoneminder.internal.ZoneMinderProperties;
 import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingMonitorConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...neminder/handler/ZoneMinderThingType.java → ...internal/handler/ZoneMinderThingType.java b/...neminder/handler/ZoneMinderThingType.java → ...internal/handler/ZoneMinderThingType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.zoneminder.handler;
+package org.openhab.binding.zoneminder.internal.handler;
 
 /**
  * Enumerator for each Bridge and Thing
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
      *
      * SPDX-License-Identifier: EPL-2.0
      */
-    package org.openhab.binding.zoneminder;
+    package org.openhab.binding.zoneminder.internal;
     /**
      *
@@ Expand Down @@