From 0a8023b85121107d494caaa7b86d4df71dfafb6a Mon Sep 17 00:00:00 2001
From: Tomas Cere <tcere@cisco.com>
Date: Fri, 27 Oct 2017 11:39:52 +0200
Subject: [PATCH] Remove the default loopback mount from the old connector
 feature

This is conflicting in sft when two projects pull in the old feature
and the new clustered topology feature. Cfg subsystem should have no
users now so remove it.

Change-Id: I97819282f39af332fa78bf58cbb99321ffa79ae0
Signed-off-by: Tomas Cere <tcere@cisco.com>
---
 .../odl-netconf-callhome-ssh/pom.xml          |  7 +--
 .../odl-netconf-connector-ssh/pom.xml         |  7 +--
 features/netconf-connector/pom.xml            |  4 --
 netconf/netconf-artifacts/pom.xml             |  5 --
 netconf/netconf-connector-config/pom.xml      | 60 -------------------
 .../blueprint/netconf-connector.xml           | 41 -------------
 netconf/pom.xml                               |  1 -
 7 files changed, 2 insertions(+), 123 deletions(-)
 delete mode 100644 netconf/netconf-connector-config/pom.xml
 delete mode 100644 netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml

diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
index 1d740e7ddf..bd07645b71 100644
--- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
@@ -23,7 +23,7 @@
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Netconf Connector :: Netconf Callhome Connector + Netconf SSH Server + loopback connection configuration</name>
+    <name>OpenDaylight :: Netconf Connector :: Netconf Callhome Connector + Netconf SSH Server</name>
 
     <dependencies>
         <dependency>
@@ -33,11 +33,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-connector-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>callhome-model</artifactId>
diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
index 25e7e23acb..a6c5ea3a55 100644
--- a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
@@ -23,7 +23,7 @@
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration</name>
+    <name>!!!DEPRECATED!!! OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server</name>
 
     <dependencies>
         <dependency>
@@ -33,10 +33,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-connector-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 7a9f79968c..85a07ab714 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -130,10 +130,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>callhome-protocol</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-config</artifactId>
diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index a3a3c60571..699395b248 100644
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -69,11 +69,6 @@
                 <artifactId>netconf-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-connector-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>mdsal-netconf-connector</artifactId>
diff --git a/netconf/netconf-connector-config/pom.xml b/netconf/netconf-connector-config/pom.xml
deleted file mode 100644
index feda712c21..0000000000
--- a/netconf/netconf-connector-config/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. 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.odlparent</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-connector-config</artifactId>
-    <description>Configuration files for netconf-connector</description>
-    <version>1.4.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-topology</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Embed-Dependency>netconf-topology</Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml b/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml
deleted file mode 100644
index 7312471308..0000000000
--- a/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Inocybe Technologies Inc. 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
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
-           odl:use-default-for-reference-types="true">
-
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
-    <odl:static-reference id="netconfConnectorFactory" interface="org.opendaylight.netconf.topology.api.NetconfConnectorFactory"/>
-
-    <cm:property-placeholder persistent-id="org.opendaylight.netconf.sal.connect"
-                             update-strategy="none">
-        <cm:default-properties>
-            <cm:property name="name" value="controller-config"/>
-            <cm:property name="address" value="127.0.0.1"/>
-            <cm:property name="port" value="1830"/>
-            <cm:property name="username" value="admin"/>
-            <cm:property name="password" value="admin"/>
-            <cm:property name="tcp-only" value="false"/>
-            <cm:property name="reconnect-on-schema-change" value="true"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
-
-    <bean id="controllerConfig" factory-ref="netconfConnectorFactory" factory-method="newInstance">
-        <argument ref="dataBroker"/>
-        <argument type="java.lang.String" value="${name}"/>
-        <argument type="java.lang.String" value="${address}"/>
-        <argument type="java.lang.Integer" value="${port}"/>
-        <argument type="java.lang.String" value="${username}"/>
-        <argument type="java.lang.String" value="${password}"/>
-        <argument type="java.lang.Boolean" value="${tcp-only}"/>
-        <argument type="java.lang.Boolean" value="${reconnect-on-schema-change}"/>
-    </bean>
-
-</blueprint>
\ No newline at end of file
diff --git a/netconf/pom.xml b/netconf/pom.xml
index 2eb593af7a..5e24837ccc 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -42,7 +42,6 @@
     <module>netconf-ssh</module>
     <module>netconf-tcp</module>
     <module>netconf-monitoring</module>
-    <module>netconf-connector-config</module>
     <module>netconf-auth</module>
     <module>aaa-authn-odl-plugin</module>
     <module>netconf-notifications-impl</module>
-- 
2.36.6