Bug 5526 - Hotfix - Fix to register provider of restconf after init

restconf application in Jersey

  * moving load on startup of new restconf draft impl to 0

Change-Id: I394393d9ddaec6c935fcdd23e4eab6e47913c0f8
Signed-off-by: Jakub Toth <jatoth@cisco.com>

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index 15ee20b310ab8c1b4e75c19546606019035a41fa..447d116ba01b728531f1bf7f63808ed904594466 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -182,11 +182,11 @@
           <instructions>
             <Bundle-Name>MD SAL Restconf Connector</Bundle-Name>
             <Private-Package>org.opendaylight.netconf.sal.rest.*,
+              org.opendaylight.restconf.*,
               org.opendaylight.netconf.sal.restconf.rpc.*,
               org.opendaylight.netconf.sal.restconf.impl,
               org.opendaylight.netconf.md.sal.rest.common.*,
               org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.rest.connector.rev140724.*,
-              org.opendaylight.restconf.*,
               javax.annotation
             </Private-Package>
             <Import-Package>

diff --git a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
index 6b4193ef548d491eccef5c62476202dda8e9c798..aa28819565e60df95b8daef87996d5bbb7274674 100644 (file)
--- a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
+++ b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
@@ -4,21 +4,21 @@
     version="3.0">
 
     <servlet>
-        <servlet-name>JAXRSRestconf</servlet-name>
+        <servlet-name>Restconf</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.opendaylight.netconf.sal.rest.impl.RestconfApplication</param-value>
+            <param-value>org.opendaylight.restconf.rest.RestconfApplication</param-value>
         </init-param>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
     <servlet>
-        <servlet-name>Restconf</servlet-name>
+        <servlet-name>JAXRSRestconf</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.opendaylight.restconf.rest.RestconfApplication</param-value>
+            <param-value>org.opendaylight.netconf.sal.rest.impl.RestconfApplication</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>