commit 31dacd4cae575b68446a291bc0ce2570da770669
author Hyunsun Moon <hyunsun.moon@gmail.com> Fri Apr 15 22:16:04 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 18 17:12:41 2016 +0000
tree 980a7326f80d8f66a281a118b3e9344681d948aa
parent bb8775b79faacec8916acc7e1c5db59939c61a89

Fixed openstack4j dependencies

Change-Id: I3bba45dc8edc71807ca5961ec191a619506ab4bc

apps/cordvtn/features.xml

diff --git a/apps/cordvtn/features.xml b/apps/cordvtn/features.xml
index 7bd3c66..1425b03 100644
--- a/apps/cordvtn/features.xml
+++ b/apps/cordvtn/features.xml
@@ -19,6 +19,5 @@
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/onos-app-cordvtn/${project.version}</bundle>
         <bundle>wrap:mvn:com.jcraft/jsch/0.1.53$Bundle-SymbolicName=jsch&amp;Bundle-Version=0.1.53</bundle>
-        <bundle>wrap:mvn:org.pacesys/openstack4j/2.11/jar/withdeps$Bundle-SymbolicName=openstack4j&amp;Bundle-Version=2.11</bundle>
     </feature>
 </features>

apps/cordvtn/pom.xml

diff --git a/apps/cordvtn/pom.xml b/apps/cordvtn/pom.xml
index 851714b..64e6e2f 100644
--- a/apps/cordvtn/pom.xml
+++ b/apps/cordvtn/pom.xml
@@ -99,11 +99,6 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-openstackinterface-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
             <artifactId>onos-app-dhcp-api</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -147,6 +142,7 @@
                         </Bundle-SymbolicName>
                         <Import-Package>
                             !org.apache.http.*,
+                            !com.fasterxml.jackson.dataformat.*,
                             *,org.glassfish.jersey.servlet
                         </Import-Package>
                         <Embed-Dependency>

apps/cordvtn/src/main/webapp/WEB-INF/web.xml

diff --git a/apps/cordvtn/src/main/webapp/WEB-INF/web.xml b/apps/cordvtn/src/main/webapp/WEB-INF/web.xml
index 2dc2c4a..37aea15 100644
--- a/apps/cordvtn/src/main/webapp/WEB-INF/web.xml
+++ b/apps/cordvtn/src/main/webapp/WEB-INF/web.xml
@@ -47,10 +47,6 @@
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.onosproject.cordvtn.rest.CordVtnWebApplication</param-value>
         </init-param>
-        <init-param>
-            <param-name>jersey.config.server.disableAutoDiscovery</param-name>
-            <param-value>true</param-value>
-        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>