From: Geng Xingyuan <geng.xingyuan@zte.com.cn>
Date: Mon, 31 Oct 2016 22:07:20 +0000 (+0800)
Subject: Bug 7065 - sal-cluster-admin not export java binding inteface in MANIFEST.MF
X-Git-Tag: release/carbon~409
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2c0ee923c337f628fd0115f780c21868e6422c11

Bug 7065 - sal-cluster-admin not export java binding inteface in MANIFEST.MF

decoupling cluster-admin api and impl.
export cluster-admin java binding api

Change-Id: Iac19d722bd805310ba8eb1dcd1341b0b1e5741bd
Signed-off-by: Geng Xingyuan <geng.xingyuan@zte.com.cn>
---

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 5fdc0ea50b..c2ffc48a83 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -263,7 +263,12 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-cluster-admin</artifactId>
+      <artifactId>sal-cluster-admin-api</artifactId>
+      <version>${controller.mdsal.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-cluster-admin-impl</artifactId>
       <version>${controller.mdsal.version}</version>
     </dependency>
     <dependency>
diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index b5266f189d..a7780bee52 100644
--- a/features/mdsal/src/main/features/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -88,7 +88,8 @@
         <bundle>mvn:org.opendaylight.controller/cds-access-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/cds-access-client/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-distributed-datastore/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-cluster-admin/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-cluster-admin-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-cluster-admin-impl/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-remoterpc-connector' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index e1b20cbd8d..5ce73d4710 100644
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -205,6 +205,11 @@
                 <artifactId>cds-access-client</artifactId>
                 <version>1.1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-cluster-admin-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- RESTCONF -->
             <dependency>
diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 099c4a6b07..fc04389f1a 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -87,7 +87,8 @@
     <!-- sal-distributed-datastore -->
     <module>sal-distributed-datastore</module>
     <module>sal-dummy-distributed-datastore</module>
-    <module>sal-cluster-admin</module>
+    <module>sal-cluster-admin-api</module>
+    <module>sal-cluster-admin-impl</module>
 
     <!-- XSQL -->
     <module>sal-dom-xsql</module>
diff --git a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
new file mode 100644
index 0000000000..ea5d5a0968
--- /dev/null
+++ b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>sal-cluster-admin-api</artifactId>
+  <version>1.5.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+
+</project>
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/yang/cluster-admin.yang b/opendaylight/md-sal/sal-cluster-admin-api/src/main/yang/cluster-admin.yang
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/yang/cluster-admin.yang
rename to opendaylight/md-sal/sal-cluster-admin-api/src/main/yang/cluster-admin.yang
diff --git a/opendaylight/md-sal/sal-cluster-admin/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
similarity index 97%
rename from opendaylight/md-sal/sal-cluster-admin/pom.xml
rename to opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
index 37a20bee6b..4b1b75d2c0 100644
--- a/opendaylight/md-sal/sal-cluster-admin/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
@@ -6,10 +6,14 @@
     <artifactId>sal-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
   </parent>
-  <artifactId>sal-cluster-admin</artifactId>
+  <artifactId>sal-cluster-admin-impl</artifactId>
   <packaging>bundle</packaging>
 
   <dependencies>
+    <dependency>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>sal-cluster-admin-api</artifactId>
+    </dependency>
     <!-- Tests -->
     <dependency>
       <groupId>junit</groupId>
@@ -191,3 +195,4 @@
     </plugins>
   </build>
 </project>
+
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/resources/org/opendaylight/blueprint/cluster-admin.xml b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/resources/org/opendaylight/blueprint/cluster-admin.xml
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/resources/org/opendaylight/blueprint/cluster-admin.xml
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/main/resources/org/opendaylight/blueprint/cluster-admin.xml
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/main/yang/cluster-admin-service.yang b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/yang/cluster-admin-service.yang
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/main/yang/cluster-admin-service.yang
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/main/yang/cluster-admin-service.yang
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java
diff --git a/opendaylight/md-sal/sal-cluster-admin/src/test/resources/simplelogger.properties b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/resources/simplelogger.properties
similarity index 100%
rename from opendaylight/md-sal/sal-cluster-admin/src/test/resources/simplelogger.properties
rename to opendaylight/md-sal/sal-cluster-admin-impl/src/test/resources/simplelogger.properties