Adding an odl-ttp-model-rest karaf feature

This feature allows for somebody to actually play with the odl-ttp-model
feature via RESTCONF.

Change-Id: Icee65ae45978a678484d113dfecd9e2486fc5f1e
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 42f0c9ebbdae4e56eb0100f62cd013c88ad9ecf5..240ac717db01c9b20e6e273508680bde481a7ffc 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -195,9 +195,6 @@
         <configuration>
           <bootFeatures>
             <feature>standard</feature>
-            <feature>odl-restconf</feature>
-            <feature>odl-mdsal-broker</feature>
-            <feature>odl-mdsal-apidocs</feature>
             <feature>odl-ttp-all</feature>
             <!--
               Optional TODO: Add entries here for the features you want in your local distro

diff --git a/features/pom.xml b/features/pom.xml
index 82cca2f6d640061be7a75f9600921610fe84a59d..d2a1f5e498d6f771b09ada1bf6e59cab125d311a 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -37,6 +37,14 @@
          <type>xml</type>
          <scope>compile</scope>
       </dependency>
+      <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>features-restconf</artifactId>
+         <version>${controller.version}</version>
+         <classifier>features</classifier>
+         <type>xml</type>
+         <scope>compile</scope>
+      </dependency>
       <!-- We currently don't use this
       <dependency>
          <groupId>org.opendaylight.openflowjava</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 49b143f644d9c384ce5bafd1f0a283cbac3c2523..d147795c1968788db3d1b04ca6b9646b4a20b04a 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -12,6 +12,7 @@
 
     <!-- Karaf Features repositories that TTP depends on -->
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-restconf/${controller.version}/xml/features</repository>
     <!-- We currently don't use this
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
     -->
@@ -19,6 +20,7 @@
     <!-- TTP "all" feature -->
     <feature name='odl-ttp-all' version='${project.version}' description='OpenDaylight :: ttp :: All'>
         <feature version='${project.version}'>odl-ttp-model</feature>
+        <feature version='${project.version}'>odl-ttp-model-rest</feature>
     </feature>
 
     <!-- TTP Model feature -->
@@ -32,6 +34,14 @@
         <bundle>mvn:org.opendaylight.controller.model/model-inventory/${controller.version}</bundle>
     </feature>
 
+    <!-- TTP Model feature -->
+    <feature name='odl-ttp-model-rest' version='${project.version}' description='OpenDaylight :: ttp :: Model'>
+        <feature version='${project.version}'>odl-ttp-model</feature>
+        <feature version='${controller.version}'>odl-mdsal-apidocs</feature>
+        <feature version='${controller.version}'>odl-restconf</feature>
+        <feature version='${controller.version}'>odl-mdsal-broker</feature>
+    </feature>
+
     <!--
         Done TODO: Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
         When naming your features please be mindful of the guidelines: