Code changes for OpenDaylight Neon

Updated code for OpenDaylight Neon (using
ccsdk/parent/tools/fluorine2neon.sh)

Change-Id: Ic54b636f691cb2c9dd627dfc3b22b523c0f4f8da
Issue-ID: CCSDK-1389
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 405a572..2450774 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-core-artifacts</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sli-core-artifacts</name>
@@ -17,7 +17,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <dependencyManagement>

diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml
index ef0c3ee..d541bab 100644 (file)
--- a/dblib/features/ccsdk-dblib/pom.xml
+++ b/dblib/features/ccsdk-dblib/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-dblib</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml
index 87c7ed7..462ca36 100644 (file)
--- a/dblib/features/features-dblib/pom.xml
+++ b/dblib/features/features-dblib/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-dblib</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index 89c0c8b..bac999f 100755 (executable)
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-feature-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index a283157..c02f6ee 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/pom.xml b/dblib/pom.xml
index 0d5d565..258a430 100755 (executable)
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>dblib</artifactId>
-   <version>0.5.2-SNAPSHOT</version>
+   <version>0.6.0-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: dblib</name>

diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index d0b97af..52a39b8 100755 (executable)
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-provider</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml b/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml
new file mode 100755 (executable)
index 0000000..d9bb99c
--- /dev/null
+++ b/dblib/provider/src/main/resources/OSGI-INF/blueprint/dblib-blueprint.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="provider" class="org.onap.ccsdk.sli.core.dblib.DBLIBResourceProvider" />
+
+    <bean id="dbResourceManager" class="org.onap.ccsdk.sli.core.dblib.DBResourceManager">
+        <argument ref="provider" />
+    </bean>
+    <service ref="dbResourceManager">
+        <interfaces>
+            <value>javax.sql.DataSource</value>
+            <value>org.onap.ccsdk.sli.core.dblib.DbLibService</value>
+        </interfaces>
+    </service>
+
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
+        <command name="dblib/encode">
+            <action class="org.onap.ccsdk.sli.core.dblib.EncShellCommand"/>
+        </command>
+    </command-bundle>
+
+</blueprint>
\ No newline at end of file

diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml
index 3f9a272..a040c36 100644 (file)
--- a/features/ccsdk-sli-core-all/pom.xml
+++ b/features/ccsdk-sli-core-all/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli-core-all</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>

diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml
index 8109a7a..b90f020 100644 (file)
--- a/features/features-sli-core/pom.xml
+++ b/features/features-sli-core/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-sli-core</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index b158354..76bd191 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>slicore-features-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index 52f8a42..f374be9 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>slicore-feature-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: features</name>

diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml
index 952e8da..390f1b3 100644 (file)
--- a/filters/features/ccsdk-filters/pom.xml
+++ b/filters/features/ccsdk-filters/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-filters</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml
index c130afe..d72f95a 100644 (file)
--- a/filters/features/features-filters/pom.xml
+++ b/filters/features/features-filters/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-filters</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index 4daca91..494f7f1 100755 (executable)
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -5,13 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>filters-features-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index b980d5a..42c39e9 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>filters-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/pom.xml b/filters/pom.xml
index 2fee26b..12f44bf 100644 (file)
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>filters</artifactId>
-   <version>0.5.2-SNAPSHOT</version>
+   <version>0.6.0-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: filters</name>

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index bf28ad9..e7555aa 100755 (executable)
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>filters-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/provider/src/main/resources/OSGI-INF/blueprint/filters-blueprint.xml b/filters/provider/src/main/resources/OSGI-INF/blueprint/filters-blueprint.xml
new file mode 100644 (file)
index 0000000..3bf8423
--- /dev/null
+++ b/filters/provider/src/main/resources/OSGI-INF/blueprint/filters-blueprint.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="filters" class="org.onap.ccsdk.sli.core.filters.FiltersServiceImpl" />
+    <service ref="filters" interface="org.onap.ccsdk.sli.core.filters.FiltersService" />
+
+</blueprint>

diff --git a/pom.xml b/pom.xml
index c52876b..711f3fa 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli-core</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core</name>

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index c35397f..24e29b2 100755 (executable)
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-common</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -70,13 +70,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
+
+        
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>

diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml
index ee93bab..8597432 100644 (file)
--- a/sli/features/features-sli/pom.xml
+++ b/sli/features/features-sli/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-sli</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml
index d53cb44..8c46e81 100644 (file)
--- a/sli/features/odl-sli/pom.xml
+++ b/sli/features/odl-sli/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index 5beb263..871d41c 100644 (file)
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.sli.core</groupId>
   <artifactId>sli-feature-aggregator</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 54e24d0..ad8a920 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index 75befd3..243223e 100755 (executable)
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,25 +5,23 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-model</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
 
     <dependencies>
        <dependency>
-               <groupId>org.opendaylight.mdsal.model</groupId>
-               <artifactId>ietf-inet-types-2013-07-15</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.opendaylight.mdsal.model</groupId>
-               <artifactId>ietf-yang-types-20130715</artifactId>
-       </dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+
+       
     </dependencies>
 </project>

diff --git a/sli/pom.xml b/sli/pom.xml
index bfb6384..b9b60e9 100755 (executable)
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-core :: sli</name>

diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml
index e311193..d1dd629 100644 (file)
--- a/sli/provider-base/pom.xml
+++ b/sli/provider-base/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-provider-base</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
     
     <properties>
     

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index aff9ca2..1326ef7 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-provider</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml b/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml
new file mode 100644 (file)
index 0000000..bb14477
--- /dev/null
+++ b/sli/provider/src/main/resources/OSGI-INF/blueprint/sli-blueprint.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="propProvider" class="org.onap.ccsdk.sli.core.sli.provider.SvcLogicPropertiesProviderImpl" />
+    <reference id="dblibService" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
+
+    <bean id="svcLogicService" class="org.onap.ccsdk.sli.core.sli.provider.SvcLogicServiceImpl">
+        <argument ref="propProvider" />
+        <argument ref="dblibService"/>
+    </bean>
+
+
+    <service ref="svcLogicService">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.core.sli.provider.SvcLogicService</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file

diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
index a4ec1b2..de8a564 100755 (executable)
--- a/sli/recording/pom.xml
+++ b/sli/recording/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-recording</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/recording/src/main/resources/OSGI-INF/blueprint/recording-blueprint.xml b/sli/recording/src/main/resources/OSGI-INF/blueprint/recording-blueprint.xml
new file mode 100644 (file)
index 0000000..6786b95
--- /dev/null
+++ b/sli/recording/src/main/resources/OSGI-INF/blueprint/recording-blueprint.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="fileRecorder" class="org.onap.ccsdk.sli.core.sli.recording.FileRecorder" />
+    <!-- Implementation name was chosen over interface name due to the fact that this Service
+         was previously registered using the implementation name rather than the interface name.
+         To ensure backwards compatibility with abstractions polling the Service Registry for the
+         fileRecorder, the implementation name was chosen here. -->
+    <service ref="fileRecorder" interface="org.onap.ccsdk.sli.core.sli.recording.FileRecorder" />
+
+    <bean id="slf4jRecorder" class="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder" />
+    <!-- Implementation name was chosen over interface name due to the fact that this Service
+         was previously registered using the implementation name rather than the interface name.
+         To ensure backwards compatibility with abstractions polling the Service Registry for the
+         slf4jRecorder, the implementation name was chosen here. -->
+    <service ref="slf4jRecorder" interface="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder" />
+
+</blueprint>
\ No newline at end of file

diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
index a045063..f55d3d4 100644 (file)
--- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-sliPluginUtils</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/features/features-sliPluginUtils/pom.xml b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
index e639b1c..3950c94 100644 (file)
--- a/sliPluginUtils/features/features-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>features-sliPluginUtils</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index 5c56b01..d95b5fd 100755 (executable)
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-features</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index fde8930..fdb245d 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 1ce7757..f9cdcec 100755 (executable)
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils</name>

diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 49a1210..1814a00 100755 (executable)
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-provider</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml b/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml
new file mode 100644 (file)
index 0000000..534b92c
--- /dev/null
+++ b/sliPluginUtils/provider/src/main/resources/OSGI-INF/blueprint/slipluginutils-blueprint.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"\r
+       xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"\r
+       odl:use-default-for-reference-types="true">\r
+\r
+       <bean id="sliPluginUtils" class="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" />\r
+       <service ref="sliPluginUtils"\r
+               interface="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" />\r
+\r
+       <bean id="sliStringUtils" class="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" />\r
+       <service ref="sliStringUtils"\r
+               interface="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" />\r
+</blueprint>\r

diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/sliapi/features/ccsdk-sliapi/pom.xml
index 329d6ff..004ec95 100644 (file)
--- a/sliapi/features/ccsdk-sliapi/pom.xml
+++ b/sliapi/features/ccsdk-sliapi/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-sliapi</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/features/features-sliapi/pom.xml b/sliapi/features/features-sliapi/pom.xml
index c95311c..8765fb9 100644 (file)
--- a/sliapi/features/features-sliapi/pom.xml
+++ b/sliapi/features/features-sliapi/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>features-sliapi</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index 6e366e6..719aa19 100755 (executable)
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-feature-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index eb69925..95fea32 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index a4faeae..2b0f587 100755 (executable)
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -5,25 +5,23 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-model</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
 
        <dependencies>
                <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-inet-types-2013-07-15</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-yang-types-20130715</artifactId>
-               </dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+
+               
        </dependencies>
 </project>

diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index c5ed07a..c9541ac 100755 (executable)
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi</name>

diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 8dd7943..533b18e 100755 (executable)
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sliapi-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
similarity index 98%
rename from sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
rename to sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
index 20cbc2e..449fc38 100644 (file)
--- a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
+++ b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.Properties;
-import java.util.concurrent.Future;
 
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -97,7 +96,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * @Override
  * public java.lang.AutoCloseable createInstance() {
  * 
- *     final sliapiProvider provider = new sliapiProvider();
+ *     final SliapiProvider provider = new SliapiProvider();
  *     provider.setDataBroker(getDataBrokerDependency());
  *     provider.setNotificationService(getNotificationServiceDependency());
  *     provider.setRpcRegistry(getRpcRegistryDependency());
@@ -116,9 +115,9 @@ import com.google.common.util.concurrent.ListenableFuture;
  * 
  * </pre>
  */
-public class sliapiProvider implements AutoCloseable, SLIAPIService {
+public class SliapiProvider implements AutoCloseable, SLIAPIService {
 
-       private static final Logger LOG = LoggerFactory.getLogger(sliapiProvider.class);
+       private static final Logger LOG = LoggerFactory.getLogger(SliapiProvider.class);
        private static final String appName = "slitester";
 
        protected DataBroker dataBroker;
@@ -149,13 +148,13 @@ public class sliapiProvider implements AutoCloseable, SLIAPIService {
                RESULTS_QNAME = QName.create(TEST_RESULT_QNAME, "results");
        }
 
-       public sliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
-                       RpcProviderRegistry rpcProviderRegistry) {
+       public SliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+                                                 RpcProviderRegistry rpcProviderRegistry) {
                this(dataBroker, notificationPublishService, rpcProviderRegistry, findSvcLogicService());
        }
 
-       public sliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
-                       RpcProviderRegistry rpcProviderRegistry, SvcLogicService svcLogic) {
+       public SliapiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+                                                 RpcProviderRegistry rpcProviderRegistry, SvcLogicService svcLogic) {
                this.LOG.info("Creating provider for " + appName);
                this.dataBroker = dataBroker;
                this.notificationService = notificationPublishService;

diff --git a/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml b/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
new file mode 100644 (file)
index 0000000..875027e
--- /dev/null
+++ b/sliapi/provider/src/main/resources/OSGI-INF/blueprint/sliapi-blueprint.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <reference id="svcLogicService"
+               interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+
+    <reference id="dataBroker"
+               interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+               odl:type="default" />
+
+    <reference id="notificationService"
+               interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+               odl:type="default" />
+
+    <reference id="rpcRegistry"
+               interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
+               odl:type="default" />
+
+    <bean id="provider" class="org.onap.ccsdk.sli.core.sliapi.SliapiProvider">
+        <argument ref="dataBroker" />
+        <argument ref="notificationService" />
+        <argument ref="rpcRegistry" />
+
+    </bean>
+</blueprint>
\ No newline at end of file

diff --git a/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml b/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
index 761b014..875027e 100644 (file)
--- a/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
+++ b/sliapi/provider/src/main/resources/org/opendaylight/blueprint/sliapi-blueprint.xml
@@ -19,7 +19,7 @@
                interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
                odl:type="default" />
 
-    <bean id="provider" class="org.onap.ccsdk.sli.core.sliapi.sliapiProvider">
+    <bean id="provider" class="org.onap.ccsdk.sli.core.sliapi.SliapiProvider">
         <argument ref="dataBroker" />
         <argument ref="notificationService" />
         <argument ref="rpcRegistry" />

diff --git a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java b/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
index 0326429..c898fff 100644 (file)
--- a/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
+++ b/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java
@@ -65,7 +65,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.exe
  */
 public class TestSliapiProvider {
 
-    private sliapiProvider provider;
+    private SliapiProvider provider;
 
     private static final String HEALTHCHECK_DG = "sli_healthcheck.xml";
 
@@ -129,8 +129,8 @@ public class TestSliapiProvider {
             svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
         }
 
-        // Finally ready to create sliapiProvider
-        provider = new sliapiProvider(dataBroker, notifyService, rpcRegistry, svc);
+        // Finally ready to create SliapiProvider
+        provider = new SliapiProvider(dataBroker, notifyService, rpcRegistry, svc);
         provider.setDataBroker(dataBroker);
         provider.setNotificationService(notifyService);
         provider.setRpcRegistry(rpcRegistry);
@@ -146,7 +146,7 @@ public class TestSliapiProvider {
 
     /**
      * Test method for
-     * {@link org.onap.ccsdk.sli.core.sliapi.sliapiProvider#executeGraph(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput)}.
+     * {@link SliapiProvider#executeGraph(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput)}.
      */
     @Test
     public void testExecuteGraph() {
@@ -198,7 +198,7 @@ public class TestSliapiProvider {
 
     /**
      * Test method for
-     * {@link org.onap.ccsdk.sli.core.sliapi.sliapiProvider#healthcheck()}.
+     * {@link SliapiProvider#healthcheck()}.
      */
     @Test
     public void testHealthcheck() {

diff --git a/sliapi/provider/src/test/resources/simplelogger.properties b/sliapi/provider/src/test/resources/simplelogger.properties
index 417c4d1..2f7d8ea 100644 (file)
--- a/sliapi/provider/src/test/resources/simplelogger.properties
+++ b/sliapi/provider/src/test/resources/simplelogger.properties
@@ -20,4 +20,4 @@
 ###
 
 org.slf4j.simpleLogger.defaultLogLevel=info
-org.slf4j.simplelogger.log.org.onap.ccsdk.sli.core.sliapi.sliapiProvider=debug
+org.slf4j.simplelogger.log.org.onap.ccsdk.sli.core.sliapi.SliapiProvider=debug

diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
index fdeeb44..71110f6 100644 (file)
--- a/utils/features/ccsdk-slicore-utils/pom.xml
+++ b/utils/features/ccsdk-slicore-utils/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-slicore-utils</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml
index c1e60c6..cc52237 100644 (file)
--- a/utils/features/features-util/pom.xml
+++ b/utils/features/features-util/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-util</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 19279b3..e1528ef 100755 (executable)
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -5,13 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-features-aggregator</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index db0c505..02b8240 100755 (executable)
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>utils-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/pom.xml b/utils/pom.xml
index 2b42734..f2bb15c 100755 (executable)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>utils</artifactId>
-   <version>0.5.2-SNAPSHOT</version>
+   <version>0.6.0-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: utils</name>

diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index 2b77997..d65fa25 100644 (file)
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/version.properties b/version.properties
index 6a35b90..50be578 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
 
 
 release_name=0
-sprint_number=5
-feature_revision=2
+sprint_number=6
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}