BUG-2182 : included data-change-counter in feature file

- rework feature file

Change-Id: Ic99fc9982834d0c4cd5543d9d85f02991a336bd4
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/feature/pom.xml b/bgp/feature/pom.xml
index c9a52433917679d53677e58c24c9b641f29a0fe0..367c9a4fa68777104ffde9c87cc6a01c08740185 100644 (file)
--- a/bgp/feature/pom.xml
+++ b/bgp/feature/pom.xml
@@ -23,8 +23,9 @@
         <features.file>features.xml</features.file>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
         <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-        <netconf.version>0.3.0-SNAPSHOT</netconf.version>
+        <config.version>0.3.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.5.0-SNAPSHOT</commons.opendaylight.version>
+        <protocol-framework.version>0.6.0-SNAPSHOT</protocol-framework.version>
         <tcpmd5.version>1.1.0-SNAPSHOT</tcpmd5.version>
     </properties>
 
@@ -46,10 +47,17 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-netconf</artifactId>
+            <artifactId>features-config</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <version>${netconf.version}</version>
+            <version>${config.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-protocol-framework</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <version>${protocol-framework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.tcpmd5</groupId>
@@ -58,22 +66,6 @@
             <type>xml</type>
             <version>${tcpmd5.version}</version>
         </dependency>
-        <!-- Required for testing -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>concepts</artifactId>
-          <version>${project.version}</version>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-concepts</artifactId>
@@ -89,11 +81,6 @@
           <artifactId>bgp-parser-api</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-parser-spi</artifactId>
-          <version>${project.version}</version>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-parser-impl</artifactId>
@@ -101,7 +88,7 @@
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-parser-mock</artifactId>
+          <artifactId>bgp-parser-spi</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -109,11 +96,6 @@
           <artifactId>bgp-rib-api</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-rib-spi</artifactId>
-          <version>${project.version}</version>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>bgp-rib-impl</artifactId>
@@ -121,22 +103,22 @@
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-testtool</artifactId>
+          <artifactId>bgp-rib-spi</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-rib-mock</artifactId>
+          <artifactId>bgp-topology-provider</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-topology-provider</artifactId>
+          <artifactId>concepts</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>bgp-util</artifactId>
+          <artifactId>data-change-counter</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -181,6 +163,13 @@
           <type>xml</type>
           <classifier>config-example</classifier>
       </dependency>
+       <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>data-change-counter-controller-config</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
 
       <dependency>
           <groupId>${project.groupId}</groupId>
@@ -194,22 +183,22 @@
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-spi</artifactId>
+          <artifactId>pcep-segment-routing</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-ietf-stateful02</artifactId>
+          <artifactId>pcep-spi</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-ietf-stateful07</artifactId>
+          <artifactId>pcep-ietf-stateful02</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-testtool</artifactId>
+          <artifactId>pcep-ietf-stateful07</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -217,11 +206,6 @@
           <artifactId>pcep-topology-api</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-topology-spi</artifactId>
-          <version>${project.version}</version>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>pcep-topology-provider</artifactId>
@@ -229,7 +213,7 @@
       </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>pcep-segment-routing</artifactId>
+          <artifactId>pcep-topology-spi</artifactId>
           <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -242,21 +226,6 @@
           <artifactId>pcep-tunnel-provider</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>rsvp-api</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.tcpmd5</groupId>
-          <artifactId>tcpmd5-api</artifactId>
-          <version>${tcpmd5.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.tcpmd5</groupId>
-          <artifactId>tcpmd5-netty</artifactId>
-          <version>${tcpmd5.version}</version>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>programming-api</artifactId>
@@ -282,6 +251,11 @@
           <artifactId>programming-tunnel-api</artifactId>
           <version>${project.version}</version>
       </dependency>
+      <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>rsvp-api</artifactId>
+          <version>${project.version}</version>
+      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>topology-api</artifactId>
@@ -297,6 +271,17 @@
           <artifactId>topology-tunnel-api</artifactId>
           <version>${project.version}</version>
       </dependency>
+      <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>util</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-buffer</artifactId>
+      </dependency>
+
       <dependency>
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>

diff --git a/bgp/feature/src/main/resources/features.xml b/bgp/feature/src/main/resources/features.xml
index c6fdfb92a53a8991de38416bb9a78eb490b8b615..dba225d10cbd894058da5af055e5a9654cefd66c 100644 (file)
--- a/bgp/feature/src/main/resources/features.xml
+++ b/bgp/feature/src/main/resources/features.xml
@@ -12,221 +12,172 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
-    <repository>mvn:org.opendaylight.controller/features-netconf/${netconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${tcpmd5.version}/xml/features</repository>
 
     <feature name='odl-bgpcep-all' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-bgpcep-util</feature>
-        <feature version='${project.version}'>odl-bgpcep-concepts</feature>
-        <feature version='${project.version}'>odl-bgpcep-parser</feature>
-        <feature version='${project.version}'>odl-bgpcep-rib</feature>
-        <feature version='${project.version}'>odl-pcep-api</feature>
-        <feature version='${project.version}'>odl-pcep-spi</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-all</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-all</feature>
+    </feature>
+
+    <feature name='odl-bgpcep-bgp-all' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-rib-impl</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-topology</feature>
+        <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/41-bgp-example.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config-example</configfile>
+    </feature>
+
+    <feature name='odl-bgpcep-pcep-all' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
-        <feature version='${project.version}'>odl-pcep-segment-routing</feature>
-        <feature version='${project.version}'>odl-bgpcep-topology</feature>
-        <feature version='${project.version}'>odl-bgpcep-linkstate</feature>
-        <feature version='${project.version}'>odl-bgpcep-tunnel</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-stateful02</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-stateful07</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-segment-routing</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-topology</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-topology-provider</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-tunnel-provider</feature>
         <feature version='${project.version}'>odl-bgpcep-programming</feature>
+        <feature version='${project.version}'>odl-bgpcep-programming-impl</feature>
         <configfile finalname="etc/opendaylight/karaf/30-programming.xml">mvn:org.opendaylight.bgpcep/programming-controller-config/${project.version}/xml/config</configfile>
-        <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/32-pcep.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/33-pcep-segment-routing.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config-segment</configfile>
         <configfile finalname="etc/opendaylight/karaf/39-pcep-provider.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/${project.version}/xml/config-provider</configfile>
-        <configfile finalname="etc/opendaylight/karaf/41-bgp-example.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config-example</configfile>
     </feature>
 
-    <!--<feature name='odl-bgpcep-pcep-all' version='${project.version}'>-->
-        <!--<feature version='${project.version}'>odl-pcep-impl</feature>-->
-        <!--<feature version='${project.version}'>odl-pcep-tunnel</feature>-->
-        <!--<feature version='${project.version}'>odl-pcep-topology</feature>-->
-        <!--<bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful02/${project.version}</bundle>-->
-        <!--<bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful07/${project.version}</bundle>-->
-    <!--</feature>-->
-
-
     <feature name='odl-bgpcep-dependencies' version='${project.version}'>
+        <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-inet-types/${ietf.types.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/concepts/${yangtools.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.controller/config-api/${netconf.version}</bundle>
-        <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/netty-config-api/${netconf.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/protocol-framework/${controller.framework.version}</bundle>
-        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
-    </feature>
-
-    <feature name='odl-bgpcep-util' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
+        <!-- util -->
         <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <bundle>mvn:org.opendaylight.yangtools/yang-binding/${yangtools.version}</bundle>
+        <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
+        <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-util/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-bgpcep-concepts' version='${project.version}'>
+    <feature name='odl-bgpcep-data-change-counter' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.controller/config-api/${netconf.version}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-data-binding</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
+        <feature version='${config.version}'>odl-config-api</feature>
+        <configfile finalname="etc/opendaylight/karaf/50-topology-data-change-counter.xml">mvn:org.opendaylight.bgpcep/data-change-counter-controller-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.bgpcep/data-change-counter/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-bgpcep-linkstate' version='${project.version}'>
+    <feature name='odl-bgpcep-bgp-parser' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-api/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-common-api/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
-        <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <feature version='${project.version}'>odl-bgpcep-parser</feature>
-        <feature version='${project.version}'>odl-bgpcep-rib</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/${project.version}</bundle>
-    </feature>
-
-
-    <feature name='odl-bgpcep-pcep-impl' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-pcep-api</feature>
-        <feature version='${project.version}'>odl-pcep-spi</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful02/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful07/${project.version}</bundle>
-    </feature>
-
-    <feature name='odl-pcep-segment-routing' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-pcep-api</feature>
-        <feature version='${project.version}'>odl-pcep-spi</feature>
-        <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-segment-routing/${project.version}</bundle>
-    </feature>
-
-    <feature name='odl-bgpcep-parser' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-bgpcep-concepts</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
+        <feature version='${config.version}'>odl-config-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-spi/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-mock/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-bgpcep-rib' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-parser</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-config/${mdsal.version}</bundle>
+    <feature name='odl-bgpcep-bgp-rib' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
+        <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-mock/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-spi/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-bgpcep-tunnel' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-bgpcep-programming</feature>
-        <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-api/${project.version}</bundle>
+    <feature name='odl-bgpcep-bgp-linkstate' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/${project.version}</bundle>
     </feature>
 
+    <feature name='odl-bgpcep-bgp-rib-impl' version='${project.version}'>
+        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
+        <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-rib</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-impl/${project.version}</bundle>
+    </feature>
 
-    <feature name='odl-bgpcep-programming' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-bgpcep-topology</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/yang-ext/${yang-ext.version}</bundle>
+    <feature name='odl-bgpcep-bgp-topology' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-bgp-linkstate</feature>
         <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/${project.version}</bundle>
-
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/bgp-topology-provider/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-pcep-api' version='${project.version}'>
+    <feature name='odl-bgpcep-pcep' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
+        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
+        <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
         <bundle>mvn:org.opendaylight.bgpcep/pcep-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-spi/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-pcep-spi' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <bundle>mvn:org.opendaylight.yangtools/yang-binding/${yangtools.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/config-api/${netconf.version}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-inet-types/${ietf.types.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-spi/${project.version}</bundle>
+    <feature name='odl-bgpcep-pcep-impl' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep</feature>
+        <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-impl/${project.version}</bundle>
     </feature>
 
-    <feature name='odl-bgpcep-topology' version='${project.version}'>
+    <feature name='odl-bgpcep-programming' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
-        <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-topology/${ietf.topology.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-topology-isis/${ietf.topology.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-ted/${ietf.topology.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-topology-l3-unicast-igp/${ietf.topology.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools.model/ietf-topology-ospf/${ietf.topology.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/concepts/${project.version}</bundle>
+        <feature version='${config.version}'>odl-config-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-spi/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-tunnel-api/${project.version}</bundle>
+    </feature>
 
-        <bundle>mvn:org.opendaylight.controller/sal-common-api/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-api/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-config/${mdsal.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-concepts/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/${project.version}</bundle>
-
+    <feature name='odl-bgpcep-programming-impl' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-programming</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/programming-impl/${project.version}</bundle>
+    </feature>
 
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-spi/${project.version}</bundle>
+    <feature name='odl-bgpcep-pcep-topology' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep</feature>
+        <feature version='${project.version}'>odl-bgpcep-programming</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-spi/${project.version}</bundle>
+    </feature>
 
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-spi/${project.version}</bundle>
+    <feature name='odl-bgpcep-pcep-stateful02' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-topology</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful02/${project.version}</bundle>
+    </feature>
 
-        <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-linkstate/${project.version}</bundle>
+    <feature name='odl-bgpcep-pcep-stateful07' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-topology</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-ietf-stateful07/${project.version}</bundle>
+    </feature>
 
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-spi/${project.version}</bundle>
+    <feature name='odl-bgpcep-pcep-topology-provider' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep-stateful02</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-stateful07</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <bundle>mvn:org.opendaylight.bgpcep/pcep-topology-provider/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/bgp-topology-provider/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/programming-topology-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-segment-routing/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.bgpcep/topology-api/${project.version}</bundle>
     </feature>
 
+    <feature name='odl-bgpcep-pcep-tunnel-provider' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep-topology-provider</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-tunnel-provider/${project.version}</bundle>
+    </feature>
+
+    <feature name='odl-bgpcep-pcep-segment-routing' version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-pcep-stateful07</feature>
+        <bundle>mvn:org.opendaylight.bgpcep/pcep-segment-routing/${project.version}</bundle>
+    </feature>
 </features>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 00944932a84fcbd63d912bed81b4d1bc81813762..3da614e8835a22f222ae8e38d4e1ae8f345fe1f3 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -53,7 +53,6 @@
         <maven.javadoc.version>2.9.1</maven.javadoc.version>
         <maven.shade.version>2.1</maven.shade.version>
         <maven.site.version>3.3</maven.site.version>
-        <surefire.version>2.15</surefire.version>
 
         <!-- YANG tools artifacts -->
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
@@ -516,7 +515,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <!--parallel>classes</parallel>

diff --git a/data-change-counter-controller-config/.project b/data-change-counter-controller-config/.project
new file mode 100644 (file)
index 0000000..8512484
--- /dev/null
+++ b/data-change-counter-controller-config/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>data-change-counter-controller-config</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.m2e.core.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>
+       </natures>
+</projectDescription>

diff --git a/data-change-counter-controller-config/pom.xml b/data-change-counter-controller-config/pom.xml
new file mode 100644 (file)
index 0000000..d631afc
--- /dev/null
+++ b/data-change-counter-controller-config/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!-- Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+       This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  and is available at http://www.eclipse.org/legal/epl-v10.html -->
+
+<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.bgpcep</groupId>
+    <artifactId>commons.parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath>../commons/parent</relativePath>
+  </parent>
+  <artifactId>data-change-counter-controller-config</artifactId>
+  <description>Controller Configuration files for data-change-counter module.</description>
+  <packaging>jar</packaging>
+  <name>${project.artifactId}</name>
+  <prerequisites>
+    <maven>3.0.4</maven>
+  </prerequisites>
+
+  <build>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <executions>
+              <execution>
+                  <id>attach-artifacts</id>
+                  <goals>
+                      <goal>attach-artifact</goal>
+                  </goals>
+                  <phase>package</phase>
+                  <configuration>
+                      <artifacts>
+                          <artifact>
+                              <file>${project.build.directory}/classes/initial/50-topology-data-change-counter.xml</file>
+                              <type>xml</type>
+                              <classifier>config</classifier>
+                          </artifact>
+                      </artifacts>
+                  </configuration>
+              </execution>
+          </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+

diff --git a/data-change-counter/src/main/resources/initial/50-topology-data-change-counter.xml b/data-change-counter-controller-config/src/main/resources/initial/50-topology-data-change-counter.xml
similarity index 100%
rename from data-change-counter/src/main/resources/initial/50-topology-data-change-counter.xml
rename to data-change-counter-controller-config/src/main/resources/initial/50-topology-data-change-counter.xml

diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml
index 89257b83bde7ae84f91ced35686fa7145c428960..11b3b6344cc1e7874d085df0403d4bfd05d5287d 100644 (file)
--- a/pcep/tunnel-provider/pom.xml
+++ b/pcep/tunnel-provider/pom.xml
@@ -170,11 +170,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-timer-config</artifactId>

diff --git a/pom.xml b/pom.xml
index 2881c2fbca1da8cc37077fb5b15c8656acce3999..fa466ff128f6edf07a454968ca5a1117d8fa42b0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
 
         <!--Test tools -->
         <module>data-change-counter</module>
+        <module>data-change-counter-controller-config</module>
 
         <!-- Parents -->
         <module>commons/parent</module>