Merge "ISSUE Opendaylight controller to get node description from OF description...

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 3c163fdd354bfc960862b7f7d289e5fc8bd7a782..96ecf13a81cee18c9091d5b51e03e44951c4f1bf 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -53,6 +53,9 @@
                <exclude>org.slf4j:slf4j-api</exclude>
                <exclude>ch.qos.logback:logback-core</exclude>
                <exclude>ch.qos.logback:logback-classic</exclude>
+               <exclude>com.sun.jersey:jersey-core</exclude>
+               <exclude>com.sun.jersey:jersey-json</exclude>
+               <exclude>com.sun.jersey:jersey-server</exclude>
       </excludes>
       <outputFileNameMapping>
         ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}      
@@ -76,6 +79,10 @@
                <include>org.slf4j:slf4j-api</include>
                <include>ch.qos.logback:logback-core</include>
                <include>ch.qos.logback:logback-classic</include>
+               <include>com.sun.jersey:jersey-core</include>
+               <include>com.sun.jersey:jersey-json</include>
+               <include>com.sun.jersey:jersey-server</include>
+               
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 3f373e95b78fb7ca409c0949b1613275e5658f98..1b90fc77980413422f1f782fb948d487fe6ad0be 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -8,7 +8,10 @@ osgi.bundles=\
        reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\
        reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\
        reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\
-        reference\:file\:../lib/logging.bridge-0.4.0-SNAPSHOT@1:start
+    reference\:file\:../lib/logging.bridge-0.4.0-SNAPSHOT@1:start,\
+    reference\:file\:../lib/jersey-core-1.17.jar@2:start,\
+    reference\:file\:../lib/jersey-json-1.17.jar@2:start,\
+    reference\:file\:../lib/jersey-server-1.17.jar@2:start
 
 # Set Default start level for framework
 osgi.bundles.defaultStartLevel=4