Eliminate odl-netconf-tcp

Integrate the TCP server into netconf-nb, where it really belongs. At
some point this will be eliminated via adoption of individual
transports.

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

diff --git a/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/NetconfNorthboundTcpServer.java
similarity index 98%
rename from netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java
rename to apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/NetconfNorthboundTcpServer.java
index b1fe4a48d2846c7ecdbc86d5a9273cb5969baca7..392c922684359050890ddea282b4da16de97aa2b 100644 (file)
--- a/netconf/mdsal-netconf-tcp/src/main/java/org/opendaylight/netconf/tcp/NetconfNorthboundTcpServer.java
+++ b/apps/netconf-nb/src/main/java/org/opendaylight/netconf/northbound/NetconfNorthboundTcpServer.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.tcp;
+package org.opendaylight.netconf.northbound;
 
 import io.netty.channel.ChannelFuture;
 import java.net.InetSocketAddress;

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 744d186770df6072ea0d3e5870469e3fd6757e6a..73a5813f82cc266dd3c2c8893c1c8974c7c5c729 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -264,11 +264,6 @@
                 <artifactId>mdsal-netconf-ssh</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-netconf-tcp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netconf-client</artifactId>
@@ -410,13 +405,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-tcp</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-util</artifactId>

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index 3b521609a5562a8e326475053a5362b35f2a25b0..e70ecfcd9c47cda655d2c62737e3361083d98f76 100644 (file)
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -88,12 +88,6 @@
           <type>xml</type>
           <classifier>features</classifier>
       </dependency>
-      <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>odl-netconf-tcp</artifactId>
-          <type>xml</type>
-          <classifier>features</classifier>
-      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>odl-netconf-util</artifactId>

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index dbb9b5e3a8793f03fa3e53b046e78be7dbe72dbc..b84d110f5fdfb8e8bbaa51a72644416ed32b7612 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -88,12 +88,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-tcp</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-util</artifactId>

diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml
index 4a3912c1ac5bd4dbc743328cb69ee83e00fad120..7456240e9946412ea94476c30b65118f5075c3a2 100644 (file)
--- a/features/netconf/odl-netconf-mdsal/pom.xml
+++ b/features/netconf/odl-netconf-mdsal/pom.xml
@@ -27,12 +27,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-tcp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-ssh</artifactId>
@@ -53,10 +47,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>mdsal-netconf-ssh</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-netconf-tcp</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-events-mdsal</artifactId>

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index 58b8a9a90fc5cea1b8f349d00111701a61d74aab..f51aafa4b83871e9063faf3e3506d6661c86346e 100644 (file)
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/netconf/odl-netconf-ssh/pom.xml
@@ -33,11 +33,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-tcp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml
deleted file mode 100644 (file)
index 1c9e939..0000000
--- a/features/netconf/odl-netconf-tcp/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>feature-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>odl-netconf-tcp</artifactId>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: Netconf Connector :: TCP</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-util</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netconf-impl</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 10f93e3344aa1442ca1bd12219cbc388a73e719c..5a4940c2886bafd7295dc8748f0fdfc95da00701 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -36,7 +36,6 @@
     <module>odl-netconf-mdsal</module>
     <module>odl-netconf-netty-util</module>
     <module>odl-netconf-ssh</module>
-    <module>odl-netconf-tcp</module>
     <module>odl-netconf-util</module>
 
     <!-- CSIT features -->

diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml
deleted file mode 100644 (file)
index 6993c94..0000000
--- a/netconf/mdsal-netconf-tcp/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Inocybe Technologies and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../parent</relativePath>
-  </parent>
-
-  <artifactId>mdsal-netconf-tcp</artifactId>
-  <name>${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.service.component.annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.service.metatype.annotations</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 8d5b6f0ac6a2f4716545c247814ad2425c693d43..37d8220545525d3d6ead69df1c56e5f701ca5fdc 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -31,7 +31,6 @@
   <modules>
     <module>netconf-config</module>
     <module>mdsal-netconf-ssh</module>
-    <module>mdsal-netconf-tcp</module>
     <module>mdsal-netconf-monitoring</module>
     <module>mdsal-netconf-yang-library</module>
     <module>netconf-netty-util</module>