Move netconf-api to protocol/

netconf-api is MD-SAL independent protocol-level API, move it to
protocol/ top-level directory.

Change-Id: I5fc4f3fed415bed00f6a84a1cbba9a7eb2e1b99b
Signed-off-by: Robert Varga <[email protected]>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index f6038590bedfb8ce56f42e61e5d875ad0e36f3f7..5cbadaab6a076d22ae8192830b43396b7c7183b6 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -29,7 +29,6 @@
   </properties>
 
   <modules>
-    <module>netconf-api</module>
     <module>netconf-dom-api</module>
     <module>netconf-config</module>
     <module>netconf-impl</module>

diff --git a/pom.xml b/pom.xml
index 72d1203fcabd1eb740ed83312e4ee836ac0a9ca1..5a00f118e3e6438fe013c9696c69edac8db6d9f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
         <module>karaf-static</module>
         <module>model</module>
         <module>transport</module>
+        <module>protocol</module>
         <module>plugins</module>
         <module>apps</module>
         <module>third-party</module>

diff --git a/netconf/netconf-api/pom.xml b/protocol/netconf-api/pom.xml
similarity index 100%
rename from netconf/netconf-api/pom.xml
rename to protocol/netconf-api/pom.xml

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/EffectiveOperation.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/EffectiveOperation.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/EffectiveOperation.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/EffectiveOperation.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/FailedNetconfMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/FailedNetconfMessage.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/FailedNetconfMessage.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/FailedNetconfMessage.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDeserializerException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDeserializerException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDeserializerException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDeserializerException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDocumentedException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDocumentedException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDocumentedException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfDocumentedException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfServerDispatcher.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListenerFactory.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListenerFactory.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListenerFactory.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListenerFactory.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfTerminationReason.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfTerminationReason.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfTerminationReason.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfTerminationReason.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/BasicCapability.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/Capability.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessage.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeader.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/util/NetconfConstants.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/util/NetconfConstants.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/util/NetconfConstants.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/util/NetconfConstants.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/MissingNameSpaceException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedElementException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/UnexpectedNamespaceException.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlElement.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java
similarity index 100%
rename from netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java
rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlUtil.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/NetconfDocumentedExceptionTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/NetconfDocumentedExceptionTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/NetconfDocumentedExceptionTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/NetconfDocumentedExceptionTest.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageAdditionalHeaderTest.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/messages/NetconfHelloMessageTest.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlElementTest.java

diff --git a/netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java b/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java
similarity index 100%
rename from netconf/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java
rename to protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/xml/XmlUtilTest.java

diff --git a/protocol/pom.xml b/protocol/pom.xml
new file mode 100644 (file)
index 0000000..69414c1
--- /dev/null
+++ b/protocol/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2023 PANTHEON.tech, s.r.o. 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>odlparent-lite</artifactId>
+        <version>12.0.1</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>protocol</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
+    <modules>
+        <module>netconf-api</module>
+    </modules>
+</project>