Changes for Karaf Integration

Signed-off-by: pchopra <pchopra@juniper.net>
Change-Id: I5c1f4cdcd531aefd21818fd9d2482d5eb53f1e86

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 5a3dd7185a3809dfe0aa74e38fd9f8f2260a238a..07b9f7ab962310518be2c35634e7f04d2852be53 100755 (executable)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -34,6 +34,30 @@
       <type>xml</type>\r
       <scope>runtime</scope>\r
     </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-adsal</artifactId>\r
+        <version>0.8.1-SNAPSHOT</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+      </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>base-features</artifactId>\r
+        <version>1.4.2-SNAPSHOT</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+      </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.controller</groupId>\r
+        <artifactId>features-nsf</artifactId>\r
+        <version>0.4.2-SNAPSHOT</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+      </dependency>\r
     <dependency>\r
         <groupId>org.opendaylight.plugin2oc</groupId>\r
         <artifactId>features-plugin2oc</artifactId>\r
@@ -42,7 +66,6 @@
         <type>xml</type>\r
         <scope>runtime</scope>\r
       </dependency>\r
-\r
     <!-- ODL Branding -->\r
     <dependency>\r
       <groupId>org.opendaylight.controller</groupId>\r
@@ -247,3 +270,4 @@
     <url>https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=summary</url>\r
   </scm>\r
 </project>\r
+\r

diff --git a/features-plugin2oc/pom.xml b/features-plugin2oc/pom.xml
index 7d92be90d055880650c18f4515e6f85a71fd83b1..f374bcce410d8e95d0bcc557e1fc99c20d5eecad 100755 (executable)
--- a/features-plugin2oc/pom.xml
+++ b/features-plugin2oc/pom.xml
@@ -26,6 +26,27 @@
    </properties>\r
 \r
    <dependencies>\r
+        <dependency>\r
+          <groupId>org.opendaylight.controller</groupId>\r
+          <artifactId>features-nsf</artifactId>\r
+          <version>0.4.2-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>org.opendaylight.controller</groupId>\r
+          <artifactId>features-adsal</artifactId>\r
+          <version>0.8.1-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
+        <dependency>\r
+          <groupId>org.opendaylight.controller</groupId>\r
+          <artifactId>base-features</artifactId>\r
+          <version>1.4.2-SNAPSHOT</version>\r
+          <classifier>features</classifier>\r
+          <type>xml</type>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>sal</artifactId>\r
@@ -115,3 +136,4 @@
       <url>https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=summary</url>\r
    </scm>\r
 </project>\r
+\r

diff --git a/features-plugin2oc/src/main/resources/features.xml b/features-plugin2oc/src/main/resources/features.xml
index 105770f9d414ccfa6ccd7d48c197ab30c60eb6ad..1a87f27c04568ba288745a031a01b7b5bb382af1 100755 (executable)
--- a/features-plugin2oc/src/main/resources/features.xml
+++ b/features-plugin2oc/src/main/resources/features.xml
@@ -8,10 +8,17 @@
 <features name="odl-plugin2oc-${project.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/features-nsf/0.4.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal/0.8.1-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/base-features/1.4.2-SNAPSHOT/xml/features</repository>
     <feature name='odl-plugin2oc' description="OpenDaylight :: plugin2oc :: Plugin" version='${project.version}'>
+        <feature>odl-nsf-managers</feature>
+        <feature>odl-adsal-all</feature>
+        <feature>odl-base-all</feature>
+        <bundle>mvn:org.opendaylight.controller/networkconfig.neutron/0.4.2-SNAPSHOT</bundle>
         <bundle>mvn:org.opendaylight.controller/sal/0.8.1-SNAPSHOT</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-binding-api/1.1-SNAPSHOT</bundle>
-        <bundle>mvn:org.opendaylight.controller/networkconfig.neutron/0.4.2-SNAPSHOT</bundle>
-        <bundle>mvn:org.opendaylight.plugin2oc/plugin2oc.neutron/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.plugin2oc/plugin2oc.neutron/0.1</bundle>
     </feature>
 </features>
+

diff --git a/neutron/pom.xml b/neutron/pom.xml
index fb42e91eaefd518f76cb5abdfdefa09494670db2..9a32dfb5bb84d4a06661bdc339633930239fa229 100755 (executable)
--- a/neutron/pom.xml
+++ b/neutron/pom.xml
@@ -50,7 +50,7 @@
                         <Bundle-Activator>\r
                             org.opendaylight.plugin2oc.neutron.Activator\r
                         </Bundle-Activator>\r
-                        <Embed-Dependency>httpclient,httpcore;type=!pom;inline=false</Embed-Dependency>\r
+                        <Embed-Dependency>httpclient,httpcore,commons-lang,commons-exec;type=!pom;inline=false</Embed-Dependency>\r
                         <Export-Package>\r
                             net.juniper.contrail.api.*;version="1.2"\r
                         </Export-Package>\r
@@ -162,3 +162,4 @@
         </dependency>\r
     </dependencies>\r
 </project>\r
+\r