Nitrogen port: sli/northbound

Update sli/northbound to compile for ODL Nitrogen

Change-Id: Ib14fea5dd3922175bd183afb9f3c85edaa7a2f0c
Issue-ID: CCSDK-177
Signed-off-by: Dan Timoney <dtimoney@att.com>

2 files changed, 79 insertions, 163 deletions

diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 7d35817ef..1722912ce 100755
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -1,105 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
-          <artifactId>dataChange</artifactId>
-          <groupId>org.onap.ccsdk.sli.northbound</groupId>
-          <version>0.2.0-SNAPSHOT</version>
-     </parent>
-     <artifactId>dataChange-provider</artifactId>
-     <packaging>bundle</packaging>
+<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>
 
-     <build>
-          <plugins>
-               <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <extensions>true</extensions>
-               </plugin>
-          </plugins>
-     </build>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
-     <dependencies>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.northbound</groupId>
-               <artifactId>dataChange-model</artifactId>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>config-api</artifactId>
+    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+    <artifactId>dataChange-provider</artifactId>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-               <version>${odl.controller.config.api.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-config</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-api</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-common-util</artifactId>
-               <version>${odl.mdsal.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.core</groupId>
-               <artifactId>sli-common</artifactId>
-               <version>${sdnctl.sli.version}</version>
-          </dependency>
-          <dependency>
-               <groupId>org.onap.ccsdk.sli.core</groupId>
-               <artifactId>sli-provider</artifactId>
-               <version>${sdnctl.sli.version}</version>
-          </dependency>
+    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-test-model</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-rest-connector</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <type>test-jar</type>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-test-model</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.netconf</groupId>
-               <artifactId>sal-rest-connector</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
 
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-broker-impl</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>sal-binding-broker-impl</artifactId>
-               <version>${odl.mdsal.version}</version>
-               <type>test-jar</type>
-               <classifier>tests</classifier>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>${junit.version}</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.testng</groupId>
-               <artifactId>testng</artifactId>
-               <version>6.11</version>
-               <scope>test</scope>
-          </dependency>
-          <dependency>
-               <groupId>org.mockito</groupId>
-               <artifactId>mockito-core</artifactId>
-               <version>${mockito.version}</version>
-               <scope>test</scope>
-          </dependency>
-     </dependencies>
 </project>
diff --git a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
deleted file mode 100755
index f7ca378b6..000000000
--- a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
+++ /dev/null
@@ -1,65 +0,0 @@
-module DataChange-provider-impl {
-
-    yang-version 1;
-    namespace "org:onap:ccsdk:sli:northbound:datachange:provider:impl";
-    prefix "DataChange-provider-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-    import opendaylight-sal-binding-broker-impl {
-        prefix binding-impl;
-        revision-date 2013-10-28;
-    }
-
-     description
-        "This module contains the base YANG definitions for
-        DataChange-provider impl implementation.";
-
-    revision "2014-05-23" {
-        description
-            "Initial revision.";
-    }
-
-    // This is the definition of the service implementation as a module identity.
-    identity DataChange-provider-impl {
-            base config:module-type;
-
-            // Specifies the prefix for generated java classes.
-            config:java-name-prefix DataChangeProvider;
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    // We consume the three main services, RPCs, DataStore, and Notifications
-    augment "/config:modules/config:module/config:configuration" {
-        case DataChange-provider-impl {
-            when "/config:modules/config:module/config:type = 'DataChange-provider-impl'";
-
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-
-            container notification-publish-adapter {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-impl:binding-new-notification-publish-service;
-                    }
-                }
-            }
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}