Do not include restconf-nb-bierman02 in odl-restconf

The old restconf implementation is now obsolete and scheduled for
removal. Do not install it by default and issue a stern warning
when it is installed.

JIRA: NETCONF-839
Change-Id: I1448a44f132d2ae4b0ba1d70a0a50e8658af41d4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index b7b12c2165cc0587d7b7cff0f11041bc023ff9bf..7af0d4a97f51d39b5110dec540f3428defe018c1 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -21,12 +21,6 @@
     <name>OpenDaylight :: Restconf</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-nb-bierman02</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf-nb-rfc8040</artifactId>

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
index 8d7c9112b33ab19cdecffe3853ab1d506315fc23..d8918dfaeba7792b00fa3cd4f593a2930c5273cd 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
@@ -34,9 +34,9 @@ public class RestconfApplication extends Application {
             final StatisticsRestconfServiceWrapper statsServiceWrapper) {
         this.controllerContext = controllerContext;
         this.statsServiceWrapper = statsServiceWrapper;
-        LOG.warn("Pre-standard version of RESTCONF activated. Please note that this implementation is superseded "
-            + "by the standard-compliant implementation. This code is no longer actively maintained and will be "
-            + "removed in a future release.");
+        LOG.warn("Pre-standard version of RESTCONF activated. Please note that this implementation is considered "
+            + "obsoleve and WILL BE REMOVED IN THE NEXT MAJOR RELEASE. Please use the RFC8040-compliant "
+            + "implementation instead.");
     }
 
     @Override