Rename singleton service components

We only have an API and an implementation. Make sure we use the
appropriate naming.

Change-Id: I471520afcb6902cf6229901a7a29bee9ba13223d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index f63bffa8eaaa56c6c4ec0be6d8f0514f2579db10..c297607671a72e66cb33f63be9904713d8e0d4c6 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -228,12 +228,12 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-common-api</artifactId>
+                <artifactId>mdsal-singleton-api</artifactId>
                 <version>13.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-dom-impl</artifactId>
+                <artifactId>mdsal-singleton-impl</artifactId>
                 <version>13.0.0-SNAPSHOT</version>
             </dependency>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 956e95a31bd06c1bd5d1a6bdbefec248bc3c07d9..83f5469bf279cd6b68991835362de489440b0b9c 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -172,11 +172,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
+            <artifactId>mdsal-singleton-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-dom-impl</artifactId>
+            <artifactId>mdsal-singleton-impl</artifactId>
         </dependency>
 
         <dependency>

diff --git a/features/odl-mdsal-singleton-common/pom.xml b/features/odl-mdsal-singleton-common/pom.xml
index 1f440fb05f51f56ec75837f64156ce08cdd92726..e91b5c7578c6a35964c7c431c6053120c22ac64d 100644 (file)
--- a/features/odl-mdsal-singleton-common/pom.xml
+++ b/features/odl-mdsal-singleton-common/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
+            <artifactId>mdsal-singleton-api</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-mdsal-singleton-dom/pom.xml b/features/odl-mdsal-singleton-dom/pom.xml
index ade63a386e068c18be5c24baafb15e682a0d5a45..93ab6df7f30ff127cb0596ae690f4c1ab5dee769 100644 (file)
--- a/features/odl-mdsal-singleton-dom/pom.xml
+++ b/features/odl-mdsal-singleton-dom/pom.xml
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-dom-impl</artifactId>
+            <artifactId>mdsal-singleton-impl</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/replicate/mdsal-replicate-netty/pom.xml b/replicate/mdsal-replicate-netty/pom.xml
index a58c584dd4977c3eadb9838f16f1bac2059b6d0a..830bdfc490f3b8b3102cd0b31e34ec45bb381729 100644 (file)
--- a/replicate/mdsal-replicate-netty/pom.xml
+++ b/replicate/mdsal-replicate-netty/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
+            <artifactId>mdsal-singleton-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -75,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-dom-impl</artifactId>
+            <artifactId>mdsal-singleton-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java
index b75973092ea273e996d1644b5f0bb1bb1e48007b..03bb91420da80223b9a5e54d543914f1a79728bc 100644 (file)
--- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java
+++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSink.java
@@ -14,7 +14,7 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.time.Duration;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;

diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java
index eee974009781c61dea1bb38bade9ead3f9ae99eb..ff49ff4a39bb0c9d839446def2ca25078a994aa7 100644 (file)
--- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java
+++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/NettyReplicationSource.java
@@ -14,7 +14,7 @@ import com.google.common.annotations.VisibleForTesting;
 import java.time.Duration;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;

diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java
index 30f50d5a99413de2a126f933e6fb555dbd334937..648cf13547f04f158a0dad7aecffc680b8c7696a 100644 (file)
--- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java
+++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SinkSingletonService.java
@@ -32,8 +32,8 @@ import org.checkerframework.checker.lock.qual.Holding;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

diff --git a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java
index 22cc0c95f811d55a31538a4b6cd6a297abb9de02..32f29c10fa45cdb782ccbc991f356d745ba767b8 100644 (file)
--- a/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java
+++ b/replicate/mdsal-replicate-netty/src/main/java/org/opendaylight/mdsal/replicate/netty/SourceSingletonService.java
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java b/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java
index a2f1920e8bc05696d850ef3923aaf3d80b56b77c..216839409c900ec528afc77e6e7ffbe6d9ce23b9 100644 (file)
--- a/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java
+++ b/replicate/mdsal-replicate-netty/src/test/java/org/opendaylight/mdsal/replicate/netty/IntegrationTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.Entity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityKey;

diff --git a/singleton-service/mdsal-singleton-common-api/pom.xml b/singleton-service/mdsal-singleton-api/pom.xml
similarity index 97%
rename from singleton-service/mdsal-singleton-common-api/pom.xml
rename to singleton-service/mdsal-singleton-api/pom.xml
index 741b2207f279a6e6458c919a8bfd298e2512ed9a..50def16e60882c3ecd087ed0f6c6e2080ad101c7 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/pom.xml
+++ b/singleton-service/mdsal-singleton-api/pom.xml
@@ -16,7 +16,7 @@
         <relativePath>../../bundle-parent</relativePath>
     </parent>
 
-    <artifactId>mdsal-singleton-common-api</artifactId>
+    <artifactId>mdsal-singleton-api</artifactId>
     <packaging>bundle</packaging>
 
     <properties>

diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java b/singleton-service/mdsal-singleton-api/src/main/java/module-info.java
similarity index 80%
rename from singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java
rename to singleton-service/mdsal-singleton-api/src/main/java/module-info.java
index b704978e31271e2a7b40bf7d4434fcec54808799..58be524d58d0ddea1fa273b3ff20234015d91b0c 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/module-info.java
+++ b/singleton-service/mdsal-singleton-api/src/main/java/module-info.java
@@ -5,8 +5,8 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-module org.opendaylight.mdsal.singleton.common.api {
-    exports org.opendaylight.mdsal.singleton.common.api;
+module org.opendaylight.mdsal.singleton.api {
+    exports org.opendaylight.mdsal.singleton.api;
 
     requires transitive org.opendaylight.yangtools.concepts;
 

diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.java
similarity index 96%
rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java
rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.java
index 58368c3618b52f014b407bfef3443fb80244a8ea..6ad7de2e71deac836fe03dd658c939cf5ec17dad 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonService.java
+++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonService.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.singleton.common.api;
+package org.opendaylight.mdsal.singleton.api;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.yangtools.concepts.Identifiable;

diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.java
similarity index 92%
rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java
rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.java
index 770e534ea414c30370e6a47890dfacc2405cd1e3..3763c84f37953db31bd633b357fb99cb4201b996 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ClusterSingletonServiceProvider.java
+++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ClusterSingletonServiceProvider.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.singleton.common.api;
+package org.opendaylight.mdsal.singleton.api;
 
 import org.opendaylight.yangtools.concepts.Registration;
 
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.concepts.Registration;
 public interface ClusterSingletonServiceProvider {
     /**
      * Method registers {@link ClusterSingletonService} to Provider.
-     * Method returns {@link java.lang.RuntimeException} for unexpected state, so be careful with implementation.
+     * Method throws {@link RuntimeException} for unexpected state, so be careful with implementation.
      * Note: RuntimeException is implemented as a notification about some problems with registration and client
      * has to implement some strategy for handling this issue.
      * TODO: RuntimeException is not a transparent contract for handling unexpected state and it needs to be

diff --git a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.java
similarity index 94%
rename from singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java
rename to singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.java
index 1e2aa4659dd3b6f4641ce40d8f28a61ddd5832a0..928280a2e19d83be8d0e5a974d9216a6f738a74a 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/src/main/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifier.java
+++ b/singleton-service/mdsal-singleton-api/src/main/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifier.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.singleton.common.api;
+package org.opendaylight.mdsal.singleton.api;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Identifier;

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/01_doubleCandidateSimpleSequence.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/02_classClusterSingletonService.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/02_classClusterSingletonService.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/02_classClusterSingletonService.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/02_classClusterSingletonService.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/03_classClusterSingletonServiceGroup.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/04_classClusterSingletonServiceProvider.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/05_pluginOsgiLifeCycle.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/06_baseAppSingleInstance.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/07_processAppSingleInstSimply.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/08_processAppSingleInst.plantuml b/singleton-service/mdsal-singleton-api/src/site/asciidoc/08_processAppSingleInst.plantuml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/08_processAppSingleInst.plantuml
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/08_processAppSingleInst.plantuml

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/asciidoc/cluster-wide-services.adoc b/singleton-service/mdsal-singleton-api/src/site/asciidoc/cluster-wide-services.adoc
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/asciidoc/cluster-wide-services.adoc
rename to singleton-service/mdsal-singleton-api/src/site/asciidoc/cluster-wide-services.adoc

diff --git a/singleton-service/mdsal-singleton-common-api/src/site/site.xml b/singleton-service/mdsal-singleton-api/src/site/site.xml
similarity index 100%
rename from singleton-service/mdsal-singleton-common-api/src/site/site.xml
rename to singleton-service/mdsal-singleton-api/src/site/site.xml

diff --git a/singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java b/singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.java
similarity index 94%
rename from singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java
rename to singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.java
index 4b3217418b75d3a57b8dd76513be1e1740c3bbb0..9609f14f1afb7b883f4270960366e85bf744ac12 100644 (file)
--- a/singleton-service/mdsal-singleton-common-api/src/test/java/org/opendaylight/mdsal/singleton/common/api/ServiceGroupIdentifierTest.java
+++ b/singleton-service/mdsal-singleton-api/src/test/java/org/opendaylight/mdsal/singleton/api/ServiceGroupIdentifierTest.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.singleton.common.api;
+package org.opendaylight.mdsal.singleton.api;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-impl/pom.xml
similarity index 96%
rename from singleton-service/mdsal-singleton-dom-impl/pom.xml
rename to singleton-service/mdsal-singleton-impl/pom.xml
index 487a85109b8d9cf90531992294dcea736d1a2673..e5a1517cbc45019a9a0ccd14dc72e6adff9b60ea 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/pom.xml
+++ b/singleton-service/mdsal-singleton-impl/pom.xml
@@ -16,7 +16,7 @@
         <relativePath>../../bundle-parent</relativePath>
     </parent>
 
-    <artifactId>mdsal-singleton-dom-impl</artifactId>
+    <artifactId>mdsal-singleton-impl</artifactId>
     <packaging>bundle</packaging>
 
     <properties>
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
+            <artifactId>mdsal-singleton-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java b/singleton-service/mdsal-singleton-impl/src/main/java/module-info.java
similarity index 81%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/module-info.java
index 920f1da08c4a49ef3d12c32688a5f1783daecb08..d715ab552edd8cf4b25433c8460677d12ccd2a79 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/module-info.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/module-info.java
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-module org.opendaylight.mdsal.singleton.dom.impl {
-    exports org.opendaylight.mdsal.singleton.dom.impl;
+module org.opendaylight.mdsal.singleton.impl {
+    exports org.opendaylight.mdsal.singleton.impl;
 
-    requires transitive org.opendaylight.mdsal.singleton.common.api;
+    requires transitive org.opendaylight.mdsal.singleton.api;
     requires transitive org.opendaylight.mdsal.eos.dom.api;
     requires org.opendaylight.mdsal.eos.common.api;
     requires org.opendaylight.yangtools.concepts;

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.java
similarity index 99%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.java
index 33179922cc8fc3b2657e9d0dcfb8f38965c8a84b..b11733363841bac79d9b128e9bd0ccddd299c526 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroup.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroup.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
@@ -35,8 +35,8 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.java
similarity index 97%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.java
index 8332a926057ee5f4ed0c6aad91ae19b2503ce6d5..bd8028d3f593f3dfe87ac25c6df33ffdc5e68dd3 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/EOSClusterSingletonServiceProvider.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/EOSClusterSingletonServiceProvider.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
@@ -30,9 +30,9 @@ import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.osgi.service.component.annotations.Activate;

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.java
similarity index 96%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.java
index 8a27e388c2c0a05f261027b328bcc9e9d07f2eb3..162e5e338c9bdb003cd6e30a4a890360a3204cf5 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderServiceGroup.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/PlaceholderServiceGroup.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
@@ -18,7 +18,7 @@ import java.util.List;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java
similarity index 94%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java
index ce19b2f40324285b0d6fdda3ad69cf05e5964052..f98cd00d85baa338a1b87ea3fd826aa1c48b8a97 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceGroup.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceGroup.java
@@ -5,15 +5,15 @@
  * 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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.concepts.Identifiable;
 
 /**

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.java
similarity index 92%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.java
index f62fb6d2e553213bbc34dce1d853c1d32aacdbea..b228753ff12ddbdb6bef82f97d7324a12c1d224b 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceInfo.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceInfo.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
@@ -14,7 +14,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.mdsal.singleton.dom.impl.ActiveServiceGroup.ServiceState;
+import org.opendaylight.mdsal.singleton.impl.ActiveServiceGroup.ServiceState;
 
 final class ServiceInfo {
     static final @NonNull ServiceInfo STARTED = new ServiceInfo(ServiceState.STARTED, null);

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java
similarity index 82%
rename from singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java
rename to singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java
index 273116725d7fd514fe3ffbe96047678ec025ef58..d4070207f05803d47c11f83a878c17f214d69c0e 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ServiceRegistration.java
+++ b/singleton-service/mdsal-singleton-impl/src/main/java/org/opendaylight/mdsal/singleton/impl/ServiceRegistration.java
@@ -5,9 +5,9 @@
  * 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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 
 abstract class ServiceRegistration extends AbstractObjectRegistration<ClusterSingletonService> {

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.java
similarity index 98%
rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java
rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.java
index bf49570e8229d2ebfea80e9141d16681434c5972..3f604b2386f1ccf0f1c78f672d5c4503b924419c 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractEOSClusterSingletonServiceProviderTest.java
+++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AbstractEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -21,8 +21,8 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.L
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NEW_OWNER;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER;
-import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE;
-import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE;
+import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE;
+import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -33,8 +33,8 @@ import org.mockito.Mock;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.concepts.Registration;
 
 /**

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.java
similarity index 98%
rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java
rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.java
index 88e3f4e3661ff57f376d37c04262cdc44241d886..d2301e1f00d279870d970fc38cf575dea1ae29c8 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/ActiveServiceGroupTest.java
+++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/ActiveServiceGroupTest.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -21,8 +21,8 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.L
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.LOCAL_OWNERSHIP_LOST_NO_OWNER;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_CHANGED;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.REMOTE_OWNERSHIP_LOST_NO_OWNER;
-import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE;
-import static org.opendaylight.mdsal.singleton.dom.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE;
+import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.CLOSE_SERVICE_ENTITY_TYPE;
+import static org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider.SERVICE_ENTITY_TYPE;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -37,8 +37,8 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
-import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ServiceGroupIdentifier;
 import org.opendaylight.yangtools.concepts.Registration;
 
 /**

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.java
similarity index 98%
rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java
rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.java
index 96dc1f16a41c320dbb038ba88c0eae952800355f..67ff41467ed3e77d88ad369f17d06cc34643b414 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/AsyncEOSClusterSingletonServiceProviderTest.java
+++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/AsyncEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,7 +25,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
 
 /*
  * Testing {@link DOMClusterSingletonServiceProviderImpl} implementation

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.java
similarity index 99%
rename from singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java
rename to singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.java
index 1a5d7abc784a771de1dcd7c68c7121d882c81e4e..8b0060b500ffc98fc7242538e72566d9d2dd9d10 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/test/java/org/opendaylight/mdsal/singleton/dom/impl/SyncEOSClusterSingletonServiceProviderTest.java
+++ b/singleton-service/mdsal-singleton-impl/src/test/java/org/opendaylight/mdsal/singleton/impl/SyncEOSClusterSingletonServiceProviderTest.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.singleton.dom.impl;
+package org.opendaylight.mdsal.singleton.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -21,7 +21,7 @@ import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipStateChange.R
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.api.ClusterSingletonService;
 
 /**
  * Synchronous test suite.

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/test/resources/simplelogger.properties b/singleton-service/mdsal-singleton-impl/src/test/resources/simplelogger.properties
similarity index 100%
rename from singleton-service/mdsal-singleton-dom-impl/src/test/resources/simplelogger.properties
rename to singleton-service/mdsal-singleton-impl/src/test/resources/simplelogger.properties

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index 5091ca0715bf3f67cfc569bfea2586d1bf4e2994..365500a07dbb2bad32d3d9e75ce4027eadebc0c5 100644 (file)
--- a/singleton-service/pom.xml
+++ b/singleton-service/pom.xml
@@ -23,13 +23,13 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <modules>
-        <module>mdsal-singleton-common-api</module>
-        <module>mdsal-singleton-dom-impl</module>
-    </modules>
-
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.install.skip>true</maven.install.skip>
     </properties>
+
+    <modules>
+        <module>mdsal-singleton-api</module>
+        <module>mdsal-singleton-impl</module>
+    </modules>
 </project>