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>

12 files changed, 70 insertions, 33 deletions

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index c35397f3..24e29b2e 100755
--- 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 ee93bab6..8597432e 100644
--- 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 d53cb449..8c46e819 100644
--- 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 5beb2633..871d41c3 100644
--- 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 54e24d00..ad8a9200 100755
--- 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 75befd35..243223e1 100755
--- 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 bfb63846..b9b60e9e 100755
--- 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 e3111937..d1dd6293 100644
--- 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 aff9ca27..1326ef7a 100755
--- 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
index 00000000..bb14477e
--- /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 a4ec1b25..de8a5644 100755
--- 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
index 00000000..6786b955
--- /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