Working md-sal features, including restconf, toaster, flow-services

Note: DO NOT MERGE until
https://git.opendaylight.org/gerrit/9847 (yangtools)
is merged as it is needed for this change.

Change-Id: Iad975cfb63b62930465edcd9e415856873b5acde
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/pom.xml b/pom.xml
index ba5dd18fc21615f3e52ddcbbe6f91c2323cc33d5..97836be4552f88e4ad960981ebea186e664a090f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <version>1.4.2-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
-  <artifactId>features-odl-protocol-framework</artifactId>
+  <artifactId>features-protocol-framework</artifactId>
   <version>${protocol-framework.version}</version>
   <packaging>pom</packaging>
 
@@ -18,11 +18,15 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-features</artifactId>
+      <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>protocol-framework</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/resources/features.xml b/src/main/resources/features.xml
index d2560f5cb046f3d70a905c37a6ed520ca3854552..6daa3432c14285d8746bcd7385b08e520213f330 100644 (file)
--- a/src/main/resources/features.xml
+++ b/src/main/resources/features.xml
@@ -3,10 +3,10 @@
 <features name="odl-protocol-framework-${protocol-framework.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           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/config-features/${config.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
   <feature name='odl-protocol-framework' version='${project.version}'>
+    <feature version='${config.version}'>odl-config-api</feature>
+    <feature version='${config.version}'>odl-config-netty-config-api</feature>
     <bundle>mvn:org.opendaylight.controller/protocol-framework/${protocol-framework.version}</bundle>
-    <feature version='${config.version}'>odl-config-api</feature> <!-- needed by netty-config-api -->
-    <feature version='${config.version}'>odl-config-netty-config-api</feature> <!-- needed by netty-config-api -->
   </feature>
 </features>
\ No newline at end of file