Move odl-mdsal-broker-local feature

JIRA: CONTROLLER-1584
Change-Id: Iae6840f75df0f90cc5427b3b83fc6289fa09ee10
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 7b5685df277edfb51a998b201839438c962edfa8..9e734e43b82003ba801a00d7d40dfd1e1c7f173f 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -279,7 +279,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-broker-local</artifactId>
+                <artifactId>odl-controller-broker-local</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index d39607d8df93b442de4416bdd8a5ebccc48368fd..bb558a79049642b6f29bbccf7356c92f908e447f 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker-local</artifactId>
+            <artifactId>odl-controller-broker-local</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-mdsal-broker-local/pom.xml b/features/odl-controller-broker-local/pom.xml
similarity index 95%
rename from features/odl-mdsal-broker-local/pom.xml
rename to features/odl-controller-broker-local/pom.xml
index b8d14d2f4035331f122831d5a2eeffe2a3f791fe..13e6f028462888647b85659d9909d9c6634d425a 100644 (file)
--- a/features/odl-mdsal-broker-local/pom.xml
+++ b/features/odl-controller-broker-local/pom.xml
@@ -15,10 +15,10 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <artifactId>odl-mdsal-broker-local</artifactId>
+    <artifactId>odl-controller-broker-local</artifactId>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: MDSAL :: Broker (local)</name>
+    <name>OpenDaylight :: Controller :: Broker (local)</name>
     <description>OpenDaylight Controller stack without clustering</description>
 
     <properties>

diff --git a/features/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/odl-controller-broker-local/src/main/feature/feature.xml
similarity index 89%
rename from features/odl-mdsal-broker-local/src/main/feature/feature.xml
rename to features/odl-controller-broker-local/src/main/feature/feature.xml
index d4ad4d4cdf2fd8be4164c7aabaf074f04ed88394..62cf54e3a6bb7787dfeb9b629e92c949a37b4488 100644 (file)
--- a/features/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/odl-controller-broker-local/src/main/feature/feature.xml
@@ -7,7 +7,7 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
-    <feature name="odl-mdsal-broker-local" version="${project.version}">
+    <feature name="odl-controller-broker-local" version="${project.version}">
         <feature version="[7,8)">odl-mdsal-dom</feature>
         <feature version="[7,8)">odl-mdsal-eos-binding</feature>
         <feature version="[7,8)">odl-mdsal-eos-dom</feature>

diff --git a/features/pom.xml b/features/pom.xml
index 14b2abcd976b1985417b593f6d2873eff04b2444..ff8b8e1ddc0e07df6c500616e4ed3129109bf991 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -49,7 +49,7 @@
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
     <module>odl-jolokia</module>
-    <module>odl-mdsal-broker-local</module>
+    <module>odl-controller-broker-local</module>
     <module>odl-mdsal-broker</module>
     <module>odl-mdsal-clustering-commons</module>
     <module>odl-mdsal-distributed-datastore</module>