Rename package in EosCommonApi

* rename package from org.opendaylight.mdsal.common.api.clustering
  to org.opendaylight.mdsal.eos.common.api

Change-Id: Ic97ceb1c81881dc23e29cca4c32b7c69d095b363
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>

diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java
index fd9ee85fa015a4a2a4e9b440de6dcfb0dbc0fc30..ebfa1d8efcae4f7f3c49f4cdf23f37a0fe9ea600 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapter.java
@@ -17,10 +17,10 @@ import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListener;
 import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListenerRegistration;
 import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipService;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
-import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntity;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipService;
+import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java
index 9c56fb98839c28f459320104617a036e3a8b8f56..a2f4db9f57eb70dded9f2a77ae2cb8579f40c220 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/clustering/BindingDOMEntityOwnershipServiceAdapterTest.java
@@ -27,15 +27,15 @@ import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipChange;
 import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListener;
 import org.opendaylight.mdsal.binding.api.clustering.EntityOwnershipListenerRegistration;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
-import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntity;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipCandidateRegistration;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipChange;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipListener;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipListenerRegistration;
 import org.opendaylight.mdsal.dom.api.clustering.DOMEntityOwnershipService;
+import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy;
 

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java
index aaa2a7cd1dee055adb7d14c618c20ece9aae9b4b..1a7df90163860545059b763c075336f778d756ad 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/Entity.java
@@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding.api.clustering;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntity;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java
index dedd6cf172b0e3d61e5224e0e115f1c2dc2d021a..c9b3fef61ac9b2b7a549fd93ddc670ca223fc5e2 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipCandidateRegistration.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipCandidateRegistration;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java
index e15b4fe79b1eb1a97a806152ebda95faf7dd88f7..4b9261a30d12bd5594eb475fdd0d7effa77b6ab7 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipChange.java
@@ -9,8 +9,8 @@ package org.opendaylight.mdsal.binding.api.clustering;
 
 import com.google.common.annotations.Beta;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipChange;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java
index 47b3b9a572a88a6af726c8d0a0ca82ed7ab453b1..acf2524b8a14a8bce8137be0a22bb4b4837eea79 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListener.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListener;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java
index ca681b27f0b2f8fa73bca17415a4289d1d1db686..aeee8c52a1252f3df6d5c9a25893d0797794c713 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipListenerRegistration.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListenerRegistration;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java
index 384996b8e30dbc1de14f99685e3601e7d421910b..cff1f3aa9d6eb695806beb27fddae1a4e87a5651 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java
+++ b/entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/clustering/EntityOwnershipService.java
@@ -10,9 +10,9 @@ package org.opendaylight.mdsal.binding.api.clustering;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipService;
+import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java
similarity index 96%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java
index 7dfb407542d5850d09c9a5f9c5b3057e38457ccc..c94b49a038a557347e2696ca3eb9ad138e2788af 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/CandidateAlreadyRegisteredException.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/CandidateAlreadyRegisteredException.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java
similarity index 98%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.java
index 4dbb629ef962916357b865197400e69fa2692fa0..1c222fc1b8457ec1c6c02debf7edc5987fc5ea0d 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeState.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeState.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.java
similarity index 94%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.java
index fcd7d8494175b22424241697018b948631833da6..f91383a7e066fadc65007737921de0a5bab07c5d 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipState.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipState.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 /**
  * Enumerates the current ownership state for an entity.

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java
similarity index 98%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.java
index 9cd856d99ac99697756b2605252e6fda85ea3148..969ee0a6da6d0eac5e85bced69db343a603309cd 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntity.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntity.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import com.google.common.base.Preconditions;
 import java.io.Serializable;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.java
similarity index 94%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.java
index 669d1f9af6a1cd7c33e4b535b1718831d1389f25..7056f1f8241da38bb3b784612126c3abadda98c5 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipCandidateRegistration.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipCandidateRegistration.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.concepts.Path;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.java
similarity index 97%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.java
index 338ecdd05e15dbad67587012c9c55ba06cbc4750..860f36de4f0371c71ae7cd2f21775fd1718cbf8b 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChange.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChange.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java
similarity index 94%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java
index e1b10d1235c2be9e0db6af9c7de8356be1b0c1b6..6e64b8ed7199d8d18eb921eb44a9310fa3233526 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListener.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import org.opendaylight.yangtools.concepts.Path;
 

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.java
similarity index 95%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.java
index b7671b733dbb0e2410821bc790df4d0df4f68fd9..05c074c12102d1696b61bf5e730241c90dae2b84 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipListenerRegistration.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipListenerRegistration.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;

diff --git a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java
similarity index 98%
rename from entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java
rename to entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.java
index 5c2713c6328ea1d9a9459c3302ac33db49cfd6f7..ae56cd1e4e8cfd6b49a013c27aebb308f8130ef7 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipService.java
+++ b/entityownership/mdsal-eos-common-api/src/main/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipService.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import com.google.common.base.Optional;
 import javax.annotation.Nonnull;

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java
similarity index 95%
rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java
rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java
index fd71d79bf08ec0da380df78af0bca32a0d54d4b6..7957523a04917cfe57a00fb19e85df7d20e4cf7c 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipChangeStateTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipChangeStateTest.java
@@ -5,13 +5,14 @@
  * 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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 
 /**
  * Unit tests for EntityOwnershipChangeState.

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java
similarity index 86%
rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java
rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java
index 417f7f58ce6116309f99f87b9cc28a80ec2a8567..4bfc56fce70815a51e68893f8c889e19ca1b117a 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/EntityOwnershipStateTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/EntityOwnershipStateTest.java
@@ -5,11 +5,12 @@
  * 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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 
 public class EntityOwnershipStateTest {
 

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java
similarity index 83%
rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java
rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.java
index 4c0819179890e05915e7ca1ebb563d68d067d408..6fc87f062b769e43fd529a35d4e47bb70ac3cd45 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityOwnershipChangeTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityOwnershipChangeTest.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14,6 +14,9 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange;
 
 public class GenericEntityOwnershipChangeTest {
 

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java
similarity index 94%
rename from entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java
rename to entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java
index 1baa613a5f5f92118c7e1d444cb62bccfd2f677e..9d8953ab4ef1aca9d36bf95429a5a05bdc695ef7 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/common/api/clustering/GenericEntityTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.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.mdsal.common.api.clustering;
+package org.opendaylight.mdsal.eos.common.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue;
 
 import javax.annotation.Nonnull;
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.yangtools.concepts.Path;
 
 public class GenericEntityTest {

diff --git a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java
index 8f044a525445c2dab23ecbfe4398899211fe8c52..6785af99a80c7ade582c087485c72d4c5fde689c 100644 (file)
--- a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java
+++ b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistration.java
@@ -10,6 +10,8 @@ package org.opendaylight.mdsal.common.api.clustering;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.concepts.Path;
 

diff --git a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java
index ec802e394c36602fa3015cc92f65492810cd5d4a..64ff3ee6daead6868396f21c5a04039618850fd8 100644 (file)
--- a/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java
+++ b/entityownership/mdsal-eos-common-spi/src/main/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistration.java
@@ -10,6 +10,10 @@ package org.opendaylight.mdsal.common.api.clustering;
 
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.concepts.Path;
 

diff --git a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java
index ea74020f33178311d55de9d242db170539b368d9..7314e256848f29492c214684e0130c2af993f708 100644 (file)
--- a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java
+++ b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipCandidateRegistrationTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 
 public class AbstractGenericEntityOwnershipCandidateRegistrationTest
         extends AbstractGenericEntityOwnershipCandidateRegistration {

diff --git a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java
index 4bcef286f4f6694d040018b637b8435420b36cd8..2e1f1e65bdcb41c04c236c201a0555d98178c0fc 100644 (file)
--- a/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java
+++ b/entityownership/mdsal-eos-common-spi/src/test/java/org/opendaylight/mdsal/common/api/clustering/AbstractGenericEntityOwnershipListenerRegistrationTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
 
 public class AbstractGenericEntityOwnershipListenerRegistrationTest
         extends AbstractGenericEntityOwnershipListenerRegistration {

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java
index 4b567a55eec7426e84105042a34855f257a23408..c0c3e25b8291157e5de76e6655f804bbcfc865fd 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntity.java
@@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.api.clustering;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntity;
+import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java
index 6bcce77dcd668bd4b089b1fa42719dd4e93c302c..3afa7acc6771aa159a743d91353b2b9b1715e1d5 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipCandidateRegistration.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.dom.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipCandidateRegistration;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipCandidateRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java
index 579a84595e70d08c1cf64a8af43f97bb264ffb30..3271972a98598a44713c20281c63594596b8bdf1 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChange.java
@@ -9,8 +9,8 @@ package org.opendaylight.mdsal.dom.api.clustering;
 
 import com.google.common.annotations.Beta;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipChange;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java
index 17a3044d0061ceb153dc56af6c8841085f754511..36c80a69217ea5f864c28b120966c3858d596158 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListener.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.dom.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListener;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListener;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java
index 312a136cddedd7eb1f6d92f33af620234fb86824..f16d9d945cda32a5875c7bab47d427a7f71197f3 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipListenerRegistration.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.dom.api.clustering;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipListenerRegistration;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java
index 7aa8502fc5b0adf8491c92b38c276b85f199a8f8..3fdf9cb1cab60e1b18bd98e89af88fe4e6a6fab4 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java
+++ b/entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipService.java
@@ -10,9 +10,9 @@ package org.opendaylight.mdsal.dom.api.clustering;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.clustering.CandidateAlreadyRegisteredException;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipState;
-import org.opendaylight.mdsal.common.api.clustering.GenericEntityOwnershipService;
+import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
+import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**

diff --git a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java
index 8f1169b50312f824f0cb080df350aceb0fc9c16f..b01a8c868927e5c845d04eed72aa28d093b22e7b 100644 (file)
--- a/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java
+++ b/entityownership/mdsal-eos-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/clustering/DOMEntityOwnershipChangeTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.api.clustering;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.opendaylight.mdsal.common.api.clustering.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;