move AlivenessProtocolHandlerRegistryImpl from internal to impl package

because there is already an internal package in the impl-protocols

This fixes this "split package" issue:

[INFO] --- maven-bundle-plugin:3.3.0:bundle (default-bundle) @alivenessmonitor-impl-protocols ---
[WARNING] Bundle org.opendaylight.genius:alivenessmonitor-impl-protocols:bundle:0.5.0-SNAPSHOT:
    Split package, multiple jars provide the same package:org/opendaylight/genius/alivenessmonitor/protocols/internal
    Use Import/Export Package directive -split-package:=(merge-first|merge-last|error|first) to get rid of this

JIRA: GENIUS-170
Change-Id: Ifd4d17769e3c96f344de8c383dec75591358d1ef
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/controller/alivenessmonitor/protocols/test/AlivenessMonitorTest.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/controller/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
index 2579824a3723acb42836448d39f007fbc06794e9..efba20b2d2dc922d0d2ba708a44b2d720ac6b08c 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/controller/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/controller/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
@@ -49,9 +49,9 @@ import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.genius.alivenessmonitor.internal.AlivenessMonitor;
 import org.opendaylight.genius.alivenessmonitor.protocols.AlivenessProtocolHandler;
 import org.opendaylight.genius.alivenessmonitor.protocols.AlivenessProtocolHandlerRegistry;
+import org.opendaylight.genius.alivenessmonitor.protocols.impl.AlivenessProtocolHandlerRegistryImpl;
 import org.opendaylight.genius.alivenessmonitor.protocols.internal.AlivenessProtocolHandlerARP;
 import org.opendaylight.genius.alivenessmonitor.protocols.internal.AlivenessProtocolHandlerLLDP;
-import org.opendaylight.genius.alivenessmonitor.protocols.internal.AlivenessProtocolHandlerRegistryImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.EtherTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorPauseInput;

diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerRegistryImpl.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
similarity index 97%
rename from alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerRegistryImpl.java
rename to alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
index a0b02a6a656e4b98f130098c3423453f1f5b35ef..f71c25fb047331c9b4ebb7c31ca2b3e337620075 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerRegistryImpl.java
+++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.genius.alivenessmonitor.protocols.internal;
+package org.opendaylight.genius.alivenessmonitor.protocols.impl;
 
 import java.util.EnumMap;
 import java.util.HashMap;