Merge changes I0d93e3c4,I34aca892,I74162d9a,Icd48e366

* changes:
  Remove netconf-auth service-type config yang
  Remove netconf-mapping-api service-type config yang
  Remove netconf-notifications-api service-type config yang
  Remove netconf-api service-type config yang

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 11f44453c7e2f4c3d53280319dc562f074dde349..ccbc32e4737a6f7dfbd5dbd75b8a72e9cde65212 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
@@ -45,11 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-manager-facade-xml</artifactId>
+      <artifactId>config-util</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/netconf/netconf-api/src/main/yang/netconf-northbound.yang b/netconf/netconf-api/src/main/yang/netconf-northbound.yang
deleted file mode 100644 (file)
index 121a4d6..0000000
--- a/netconf/netconf-api/src/main/yang/netconf-northbound.yang
+++ /dev/null
@@ -1,31 +0,0 @@
-module netconf-northbound {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound";
-    prefix "nn";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "This module contains the base YANG definitions for
-         netconf northbound server API";
-
-    revision "2015-01-14" {
-        description
-            "Initial revision.";
-    }
-
-    identity netconf-server-dispatcher {
-        base "config:service-type";
-        config:java-class "org.opendaylight.netconf.api.NetconfServerDispatcher";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-
-    identity netconf-server-monitoring {
-        base "config:service-type";
-        config:java-class "org.opendaylight.netconf.api.monitoring.NetconfMonitoringService";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-
-}
\ No newline at end of file

diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml
index 9134e57235dec27a6b759189c3feeb0d5b09e05f..4a64ebdacc0aaf64f045815974367ce7aa57c812 100644 (file)
--- a/netconf/netconf-auth/pom.xml
+++ b/netconf/netconf-auth/pom.xml
@@ -10,9 +10,9 @@
 <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.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/netconf-auth/src/main/yang/netconf-auth.yang b/netconf/netconf-auth/src/main/yang/netconf-auth.yang
deleted file mode 100644 (file)
index 97213b5..0000000
--- a/netconf/netconf-auth/src/main/yang/netconf-auth.yang
+++ /dev/null
@@ -1,24 +0,0 @@
-module netconf-auth {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:netconf:auth";
-    prefix "na";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "This module contains the base YANG definitions for
-         netconf northbound server API";
-
-    revision "2015-07-15" {
-        description
-            "Initial revision.";
-    }
-
-    identity netconf-auth-provider {
-        base "config:service-type";
-        config:java-class "org.opendaylight.netconf.auth.AuthProvider";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-
-}
\ No newline at end of file

diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml
index 387d8e139b05e7298e378d5c43a4f3a7f70ab88b..35e14fcd2cc910b3bd09346bdde6ef0f7e64aee9 100644 (file)
--- a/netconf/netconf-mapping-api/pom.xml
+++ b/netconf/netconf-mapping-api/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-mapping-api/src/main/yang/netconf-northbound-mapper.yang b/netconf/netconf-mapping-api/src/main/yang/netconf-northbound-mapper.yang
deleted file mode 100644 (file)
index 211f1f8..0000000
--- a/netconf/netconf-mapping-api/src/main/yang/netconf-northbound-mapper.yang
+++ /dev/null
@@ -1,31 +0,0 @@
-module netconf-northbound-mapper {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper";
-    prefix "nnm";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "This module contains the base YANG definitions for
-         mapping services plugged into a netconf northbound server";
-
-    revision "2015-01-14" {
-        description
-            "Initial revision.";
-    }
-
-    identity netconf-northbound-mapper {
-        base "config:service-type";
-        config:java-class "org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-
-    identity netconf-mapper-registry {
-        base "config:service-type";
-        config:java-class "org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-
-}
\ No newline at end of file

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index 967dfe6f98f9192e60d12888d018af6a43ca0dad..3f5ea9d29dd01a4dc70eabff4f600ac6e4dde911 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -13,9 +13,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/netconf-notifications-api/src/main/yang/netconf-northbound-notification.yang b/netconf/netconf-notifications-api/src/main/yang/netconf-northbound-notification.yang
deleted file mode 100644 (file)
index f821a31..0000000
--- a/netconf/netconf-notifications-api/src/main/yang/netconf-northbound-notification.yang
+++ /dev/null
@@ -1,29 +0,0 @@
-module netconf-northbound-notification {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification";
-    prefix "nnn";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "This module contains the base YANG definitions for
-         netconf northbound notifications API";
-
-    revision "2015-08-06" {
-            description "Initial revision.";
-    }
-
-    identity netconf-notification-collector {
-            base "config:service-type";
-            config:java-class "org.opendaylight.netconf.notifications.NetconfNotificationCollector";
-            config:disable-osgi-service-registration;
-            status deprecated;
-        }
-
-    identity netconf-notification-registry {
-           base "config:service-type";
-           config:java-class "org.opendaylight.netconf.notifications.NetconfNotificationRegistry";
-           config:disable-osgi-service-registration;
-           status deprecated;
-    }
-}
\ No newline at end of file