Code changes for OpenDaylight Neon

Updated code for OpenDaylight Neon, using conversion script
in ccsdk/parent/tools.

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

diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml
index 1c5b5e3..d9a956a 100644 (file)
--- a/aai-service/features/ccsdk-aai-service/pom.xml
+++ b/aai-service/features/ccsdk-aai-service/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.adaptors</groupId>
     <artifactId>ccsdk-aai-service</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>

diff --git a/aai-service/features/features-aai-service/pom.xml b/aai-service/features/features-aai-service/pom.xml
index 6af177d..20b366d 100755 (executable)
--- a/aai-service/features/features-aai-service/pom.xml
+++ b/aai-service/features/features-aai-service/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.adaptors</groupId>
     <artifactId>features-aai-service</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>

diff --git a/aai-service/features/pom.xml b/aai-service/features/pom.xml
index 434687b..10f6432 100755 (executable)
--- a/aai-service/features/pom.xml
+++ b/aai-service/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.adaptors</groupId>
     <artifactId>aai-service-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>

diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml
index 9205617..1e5cacf 100755 (executable)
--- a/aai-service/installer/pom.xml
+++ b/aai-service/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.adaptors</groupId>
     <artifactId>aai-service-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>

diff --git a/aai-service/pom.xml b/aai-service/pom.xml
index cbebfb1..8fe1543 100755 (executable)
--- a/aai-service/pom.xml
+++ b/aai-service/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.adaptors</groupId>
     <artifactId>aai-service</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service</name>

diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index e07c3ec..fa34556 100755 (executable)
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -5,16 +5,17 @@
     <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.adaptors</groupId>
     <artifactId>aai-service-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
+    <url>http://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,18 +48,17 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-provider</artifactId>
             <version>${ccsdk.sli.core.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml b/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
new file mode 100755 (executable)
index 0000000..9709366
--- /dev/null
+++ b/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
+                          reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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.adaptors.aai.AAIServiceProvider" />
+
+    <bean id="aaiService" class="org.onap.ccsdk.sli.adaptors.aai.AAIService">
+        <argument ref="provider" />
+    </bean>
+    <service ref="aaiService">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.aai.AAIService</value>
+            <value>org.onap.ccsdk.sli.adaptors.aai.AAIClient</value>
+        </interfaces>
+    </service>
+
+</blueprint>

diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index 00f92b5..da8a41f 100644 (file)
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -17,13 +17,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.adaptors</groupId>
        <artifactId>ansible-adapter-bundle</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
 
@@ -57,21 +57,26 @@
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
                </dependency>
+
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
                </dependency>
+
+
                <!-- Needed to run test cases -->
                <dependency>
                        <groupId>org.glassfish.jersey.core</groupId>
                        <artifactId>jersey-common</artifactId>
                        <scope>test</scope>
                </dependency>
+
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
                        <artifactId>jackson-jaxrs</artifactId>
                        <scope>test</scope>
                </dependency>
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
@@ -85,13 +90,13 @@
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-common</artifactId>
-                       <scope>provided</scope>
                </dependency>
+
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-provider</artifactId>
-                       <scope>provided</scope>
                </dependency>
+
                <dependency>
                        <groupId>org.osgi</groupId>
                        <artifactId>org.osgi.core</artifactId>
@@ -101,10 +106,24 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
                </dependency>
+
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>jcl-over-slf4j</artifactId>
+               </dependency>
+
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>
                </dependency>
+
+
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+               </dependency>
+
+
        </dependencies>
 
 

diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml b/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml
new file mode 100755 (executable)
index 0000000..d7be01e
--- /dev/null
+++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
+                          reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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.adaptors.ansible.impl.AnsibleAdapterPropertiesProviderImpl" />
+
+    <bean id="ansibleAdapterInstance" class="org.onap.ccsdk.sli.adaptors.ansible.impl.AnsibleAdapterImpl">
+        <argument ref="propProvider"/>
+    </bean>
+
+    <service ref="ansibleAdapterInstance">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter</value>
+        </interfaces>
+    </service>
+
+</blueprint>

diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
index ef2757c..cc35a73 100644 (file)
--- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/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.adaptors</groupId>
     <artifactId>ccsdk-ansible-adapter</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
@@ -28,7 +28,6 @@
             <version>${ccsdk.sli.core.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
index 415597f..0d6fa20 100755 (executable)
--- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/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.adaptors</groupId>
     <artifactId>features-ansible-adapter</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>

diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml
index 705bd09..6863e06 100644 (file)
--- a/ansible-adapter/ansible-adapter-features/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>ansible-adapter-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
 
     <packaging>pom</packaging>

diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 263480b..f2ab5bd 100644 (file)
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -27,12 +27,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.adaptors</groupId>
     <artifactId>ansible-adapter-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name>
     <packaging>pom</packaging>
     <properties>

diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index 02804a9..d09afdd 100644 (file)
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -27,13 +27,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.adaptors</groupId>
   <artifactId>ansible-adaptor</artifactId>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>ccsdk-sli-adaptors :: ansible-adapter</name>
   <description>Abstractions to interact with Ansible server via REST</description>
   <packaging>pom</packaging>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0c3c4a2..f252800 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
        <artifactId>sli-adaptors-artifacts</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-adaptors :: sli-adaptors-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>
@@ -71,13 +71,6 @@
                                <type>xml</type>
                                <classifier>feature</classifier>
                        </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                               <artifactId>ccsdk-base-http</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
                        <dependency>
                                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                                <artifactId>aai-service-provider</artifactId>
@@ -148,16 +141,6 @@
                                <artifactId>sql-resource-installer</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                               <artifactId>base-http-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                               <artifactId>base-http-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
                </dependencies>
        </dependencyManagement>
 

diff --git a/base/http/features/ccsdk-base-http/pom.xml b/base/http/features/ccsdk-base-http/pom.xml
index 38181b6..c417382 100644 (file)
--- a/base/http/features/ccsdk-base-http/pom.xml
+++ b/base/http/features/ccsdk-base-http/pom.xml
@@ -5,7 +5,7 @@
        <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>
 

diff --git a/base/http/features/features-base-http/pom.xml b/base/http/features/features-base-http/pom.xml
index 3b7766f..4b51ccc 100644 (file)
--- a/base/http/features/features-base-http/pom.xml
+++ b/base/http/features/features-base-http/pom.xml
@@ -5,7 +5,7 @@
        <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>
 

diff --git a/base/http/features/pom.xml b/base/http/features/pom.xml
index 960a719..6e3cea5 100644 (file)
--- a/base/http/features/pom.xml
+++ b/base/http/features/pom.xml
@@ -5,7 +5,7 @@
     <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>
 

diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml
index 4ba0614..443d8c4 100644 (file)
--- a/base/http/installer/pom.xml
+++ b/base/http/installer/pom.xml
@@ -5,7 +5,7 @@
        <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>
 

diff --git a/base/http/pom.xml b/base/http/pom.xml
index 6557105..e556b94 100644 (file)
--- a/base/http/pom.xml
+++ b/base/http/pom.xml
@@ -5,7 +5,7 @@
     <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>
 

diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml
index 083a7fc..17ff739 100644 (file)
--- a/base/http/provider/pom.xml
+++ b/base/http/provider/pom.xml
@@ -5,7 +5,7 @@
        <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>
 

diff --git a/base/pom.xml b/base/pom.xml
index 12a2f77..f46dda7 100644 (file)
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -4,7 +4,7 @@
     <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>
 

diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml
index 47a4314..e48b58e 100644 (file)
--- a/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/features/ccsdk-sli-adaptors-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.adaptors</groupId>
     <artifactId>ccsdk-sli-adaptors-all</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
@@ -80,12 +80,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-base-http</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
   </dependencies>
 </project>

diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml
index ed68357..bbdbb6e 100644 (file)
--- a/features/features-sli-adaptors/pom.xml
+++ b/features/features-sli-adaptors/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.adaptors</groupId>
     <artifactId>features-sli-adaptors</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index ffb577a..76643ef 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.adaptors</groupId>
        <artifactId>sliadaptors-features-installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index 3677957..73ad702 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.adaptors</groupId>
        <artifactId>sliadaptors-feature-aggregator</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-adaptors :: features</name>

diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
index cbaee25..cb73db0 100644 (file)
--- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
+++ b/mdsal-resource/features/ccsdk-mdsal-resource/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.adaptors</groupId>
     <artifactId>ccsdk-mdsal-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
@@ -29,8 +29,8 @@
             <version>${ccsdk.sli.core.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mdsal-resource-provider</artifactId>

diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml
index c99fe81..7314197 100755 (executable)
--- a/mdsal-resource/features/features-mdsal-resource/pom.xml
+++ b/mdsal-resource/features/features-mdsal-resource/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.adaptors</groupId>
     <artifactId>features-mdsal-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>

diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml
index cdc1304..c597abd 100755 (executable)
--- a/mdsal-resource/features/pom.xml
+++ b/mdsal-resource/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.adaptors</groupId>
     <artifactId>mdsal-resource-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>

diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index 3fa53e1..649b661 100755 (executable)
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/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.adaptors</groupId>
     <artifactId>mdsal-resource-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>

diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index accb8cb..364850f 100755 (executable)
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/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.adaptors</groupId>
     <artifactId>mdsal-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource</name>

diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 2c69e4a..91534cb 100755 (executable)
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/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.adaptors</groupId>
     <artifactId>mdsal-resource-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>

diff --git a/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml b/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml
new file mode 100755 (executable)
index 0000000..9c69126
--- /dev/null
+++ b/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
+                          reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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.adaptors.resource.mdsal.MdsalResourcePropertiesProviderImpl" />
+
+
+    <bean id="configResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource">
+        <argument ref="propProvider"/>
+    </bean>
+    
+    <bean id="operResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource">
+        <argument ref="propProvider"/>
+    </bean>
+
+    <service ref="configResourceInstance">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource</value>
+        </interfaces>
+    </service>
+
+    <service ref="operResourceInstance">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource</value>
+        </interfaces>
+    </service>
+</blueprint>

diff --git a/message-router/consumer/api/pom.xml b/message-router/consumer/api/pom.xml
index 2b55169..43c3148 100755 (executable)
--- a/message-router/consumer/api/pom.xml
+++ b/message-router/consumer/api/pom.xml
@@ -5,7 +5,7 @@
        <parent>
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>consumer.aggregate</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>consumer.api</artifactId>

diff --git a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
index f3fc352..f6dda22 100755 (executable)
--- a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
+++ b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>ccsdk-messagerouter-consumer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
        
        <dependencies>

diff --git a/message-router/consumer/features/features-messagerouter-consumer/pom.xml b/message-router/consumer/features/features-messagerouter-consumer/pom.xml
index a1e12a4..dac4461 100755 (executable)
--- a/message-router/consumer/features/features-messagerouter-consumer/pom.xml
+++ b/message-router/consumer/features/features-messagerouter-consumer/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.adaptors.messagerouter</groupId>
     <artifactId>features-messagerouter-consumer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>

diff --git a/message-router/consumer/features/pom.xml b/message-router/consumer/features/pom.xml
index 2651a50..54193f9 100755 (executable)
--- a/message-router/consumer/features/pom.xml
+++ b/message-router/consumer/features/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>consumer.features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
 
     <packaging>pom</packaging>

diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml
index 1e6cc38..304b639 100755 (executable)
--- a/message-router/consumer/installer/pom.xml
+++ b/message-router/consumer/installer/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>consumer.aggregate</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>consumer.installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <properties>

diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml
index 6476c40..585b378 100755 (executable)
--- a/message-router/consumer/pom.xml
+++ b/message-router/consumer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>messagerouter-root</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>consumer.aggregate</artifactId>

diff --git a/message-router/consumer/provider/pom.xml b/message-router/consumer/provider/pom.xml
index 3b1373e..bc107db 100755 (executable)
--- a/message-router/consumer/provider/pom.xml
+++ b/message-router/consumer/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>consumer.aggregate</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>consumer.provider</artifactId>

diff --git a/message-router/pom.xml b/message-router/pom.xml
index 1e05902..9f5c88c 100755 (executable)
--- a/message-router/pom.xml
+++ b/message-router/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.adaptors.messagerouter</groupId>
        <artifactId>messagerouter-root</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <modules>

diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml
index 1bdc3a2..7a48fb4 100755 (executable)
--- a/message-router/publisher/api/pom.xml
+++ b/message-router/publisher/api/pom.xml
@@ -5,7 +5,7 @@
        <parent>
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>publisher.aggregate</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>publisher.api</artifactId>

diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
index 81423b4..0acfb5e 100755 (executable)
--- a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
+++ b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.3.3-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>ccsdk-messagerouter-publisher</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
        
        <dependencies>

diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml
index 3460d8a..2fc8c14 100755 (executable)
--- a/message-router/publisher/features/features-messagerouter-publisher/pom.xml
+++ b/message-router/publisher/features/features-messagerouter-publisher/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.adaptors.messagerouter</groupId>
     <artifactId>features-messagerouter-publisher</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>

diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml
index bf7d8b2..1c0825e 100644 (file)
--- a/message-router/publisher/features/pom.xml
+++ b/message-router/publisher/features/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
     <artifactId>publisher.features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId}</name>
 
     <packaging>pom</packaging>

diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml
index de3b512..e34a665 100644 (file)
--- a/message-router/publisher/installer/pom.xml
+++ b/message-router/publisher/installer/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>publisher.aggregate</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
        <artifactId>publisher.installer</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <properties>

diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml
index 989254d..f7232fb 100755 (executable)
--- a/message-router/publisher/pom.xml
+++ b/message-router/publisher/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>messagerouter-root</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>publisher.aggregate</artifactId>

diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml
index 347e6a4..2ecbfd1 100755 (executable)
--- a/message-router/publisher/provider/pom.xml
+++ b/message-router/publisher/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>publisher.aggregate</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>publisher.provider</artifactId>

diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml
index d7ddce5..81fbeba 100755 (executable)
--- a/message-router/publisher/sample.client/pom.xml
+++ b/message-router/publisher/sample.client/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
                <artifactId>publisher.aggregate</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>sample.client</artifactId>

diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml
index c9d105b..eee7991 100644 (file)
--- a/netbox-client/features/ccsdk-netbox-client/pom.xml
+++ b/netbox-client/features/ccsdk-netbox-client/pom.xml
@@ -20,38 +20,47 @@
     <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.adaptors</groupId>
     <artifactId>ccsdk-netbox-client</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
+
     <properties>
         <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
 
+
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>
             <version>${ccsdk.sli.core.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-dblib</artifactId>
             <version>${ccsdk.sli.core.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netbox-client-provider</artifactId>

diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml
index 556a857..b1195eb 100755 (executable)
--- a/netbox-client/features/features-netbox-client/pom.xml
+++ b/netbox-client/features/features-netbox-client/pom.xml
@@ -20,13 +20,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.adaptors</groupId>
     <artifactId>features-netbox-client</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>

diff --git a/netbox-client/features/pom.xml b/netbox-client/features/pom.xml
index b3740b3..3556a4c 100755 (executable)
--- a/netbox-client/features/pom.xml
+++ b/netbox-client/features/pom.xml
@@ -20,13 +20,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.adaptors</groupId>
     <artifactId>netbox-client-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>

diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index aab9b07..ac85879 100755 (executable)
--- a/netbox-client/installer/pom.xml
+++ b/netbox-client/installer/pom.xml
@@ -20,13 +20,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.adaptors</groupId>
     <artifactId>netbox-client-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>

diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml
index c22560a..c1b4e3e 100644 (file)
--- a/netbox-client/pom.xml
+++ b/netbox-client/pom.xml
@@ -20,13 +20,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.adaptors</groupId>
     <artifactId>netbox-client</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: netbox-client</name>

diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml
index c6237d3..cbc698b 100644 (file)
--- a/netbox-client/provider/pom.xml
+++ b/netbox-client/provider/pom.xml
@@ -19,13 +19,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.adaptors</groupId>
     <artifactId>netbox-client-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>
 
@@ -71,13 +71,13 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -101,13 +101,12 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
+            <version>2.23.2</version>
             <scope>test</scope>
         </dependency>
-        <!-- Need to override ODL version of jetty-server to get test to compile -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.3.1.v20150714</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
new file mode 100644 (file)
index 0000000..b667dcb
--- /dev/null
+++ b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<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="dbLibService"
+      interface="org.onap.ccsdk.sli.core.dblib.DbLibService"/>
+
+    <bean id="netboxProperty" class="org.onap.ccsdk.sli.adaptors.netbox.property.NetboxProperties"/>
+    <bean id="httpClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxHttpClient" destroy-method="close">
+        <argument ref="netboxProperty"/>
+    </bean>
+
+    <bean id="netboxClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxClientImpl">
+        <argument ref="httpClient"/>
+        <argument ref="dbLibService"/>
+    </bean>
+
+    <service ref="netboxClient"
+      interface="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient"
+      odl:type="default"/>
+
+</blueprint>

diff --git a/pom.xml b/pom.xml
index 61c05c1..26bf386 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -103,15 +103,14 @@
         <module>mdsal-resource</module>
         <module>resource-assignment</module>
         <module>sql-resource</module>
-        <module>base</module>
-        <module>message-router</module>
         <module>features</module>
         <module>artifacts</module>
+        <module>message-router</module>
     </modules>
     <organization>
         <name>ONAP</name>
     </organization>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
 
 
 </project>

diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
index 61fdf44..d89cda0 100644 (file)
--- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml
+++ b/resource-assignment/features/ccsdk-resource-assignment/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.adaptors</groupId>
     <artifactId>ccsdk-resource-assignment</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>

diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml
index 2a852f2..09e7a06 100755 (executable)
--- a/resource-assignment/features/features-resource-assignment/pom.xml
+++ b/resource-assignment/features/features-resource-assignment/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.adaptors</groupId>
     <artifactId>features-resource-assignment</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>

diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
index 6c1dcda..d7e77ba 100755 (executable)
--- a/resource-assignment/features/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>

diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 5501cf6..900ad9f 100755 (executable)
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>

diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index 425af02..b17b31a 100755 (executable)
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment</name>

diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index bb498e6..a73949e 100755 (executable)
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>

diff --git a/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml
new file mode 100755 (executable)
index 0000000..77c316d
--- /dev/null
+++ b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+                                                       reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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="dblib.dataSource" interface="javax.sql.DataSource" filter="(objectClass=org.onap.ccsdk.sli.core.dblib.DbLibService)"/>
+
+        <service ref="resourceAllocator" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator"/>
+
+        <service ref="resourceLockNode" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceLockNode"/>
+
+</blueprint>

diff --git a/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml
new file mode 100755 (executable)
index 0000000..7fcc70c
--- /dev/null
+++ b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+                                                       reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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">
+
+       <!-- JDBC setup -->
+
+       <bean id="rm.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.DataSourceWrap">
+               <property name="dataSource" ref="dblib.dataSource" />
+       </bean>
+
+       <bean id="lock.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.CachedDataSourceWrap">
+               <property name="dataSource" ref="rm.dataSource" />
+       </bean>
+
+       <bean id="rm.jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+               <property name="dataSource" ref="rm.dataSource" />
+       </bean>
+
+       <bean id="lock.jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+               <property name="dataSource" ref="lock.dataSource" />
+       </bean>
+
+       <!-- Resource Lock Configuration -->
+
+       <bean id="resourceLockDao" class="org.onap.ccsdk.sli.adaptors.lock.dao.ResourceLockDaoImpl">
+               <property name="jdbcTemplate" ref="lock.jdbcTemplate" />
+       </bean>
+
+       <bean id="lockHelper" class="org.onap.ccsdk.sli.adaptors.lock.comp.LockHelperImpl">
+               <property name="resourceLockDao" ref="resourceLockDao" />
+               <property name="retryCount" value="10" />
+               <property name="lockWait" value="5" /> <!-- Seconds -->
+       </bean>
+
+       <!-- RM Configuration -->
+
+       <bean id="resourceJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceJdbcDaoImpl">
+               <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
+       </bean>
+
+       <bean id="allocationItemJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
+               <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
+       </bean>
+
+       <bean id="resourceLoadJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
+               <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
+       </bean>
+
+       <bean id="resourceDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceDaoImpl">
+               <property name="resourceJdbcDao" ref="resourceJdbcDao" />
+               <property name="allocationItemJdbcDao" ref="allocationItemJdbcDao" />
+               <property name="resourceLoadJdbcDao" ref="resourceLoadJdbcDao" />
+       </bean>
+
+       <bean id="resourceManager" class="org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManagerImpl">
+               <property name="lockHelper" ref="lockHelper" />
+               <property name="resourceDao" ref="resourceDao" />
+               <property name="lockTimeout" value="600" /> <!-- Seconds -->
+       </bean>
+
+       <!-- Rule DAO Configuration -->
+
+       <bean id="resourceRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDaoImpl">
+               <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
+       </bean>
+
+       <bean id="rangeRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDaoImpl">
+               <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
+       </bean>
+
+       <!-- ResourceAllocator Configuration -->
+
+       <bean id="resourceAllocator" class="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator">
+               <property name="resourceManager" ref="resourceManager" />
+               <property name="endPointAllocator" ref="endPointAllocator" />
+               <property name="speedUtil" ref="speedUtil" />
+       </bean>
+
+       <bean id="resourceLockNode" class="org.onap.ccsdk.sli.adaptors.ra.ResourceLockNode">
+               <property name="lockHelper" ref="lockHelper" />
+       </bean>
+
+       <bean id="speedUtil" class="org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil" />
+
+       <!-- EndPointAllocator Configuration -->
+
+       <bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
+               <property name="resourceManager" ref="resourceManager" />
+               <property name="allocationRuleMap">
+                       <map>
+                               <entry key="DEFAULT">
+                                       <list>
+                                               <ref component-id="dbAllocationRule" />
+                                       </list>
+                               </entry>
+                       </map>
+               </property>
+       </bean>
+
+       <!-- Resource Allocation Rule Configuration -->
+
+       <bean id="dbAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.DbAllocationRule">
+               <property name="resourceRuleDao" ref="resourceRuleDao" />
+               <property name="rangeRuleDao" ref="rangeRuleDao" />
+       </bean>
+
+</blueprint>

diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml
index e9fbc14..1d61831 100644 (file)
--- a/saltstack-adapter/pom.xml
+++ b/saltstack-adapter/pom.xml
@@ -27,13 +27,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.adaptors</groupId>
     <artifactId>saltstack-adaptor</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: saltstack-adapter</name>
     <description>Abstractions to interact with Saltstack server via REST
     </description>

diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
index 28ddc6d..3d9ec20 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/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.adaptors</groupId>
        <artifactId>ccsdk-saltstack-adapter</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name>

diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
index 2f6ad9f..a3e21d9 100755 (executable)
--- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/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.adaptors</groupId>
     <artifactId>features-saltstack-adapter</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}

diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml
index c7e1d42..57875e8 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-features/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/pom.xml
@@ -15,12 +15,12 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>saltstack-adapter-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
     </name>
 

diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index d364351..639e308 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -27,12 +27,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.adaptors</groupId>
     <artifactId>saltstack-adapter-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
     </name>
     <packaging>pom</packaging>

diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index d863ca0..fb875e4 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -16,13 +16,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.adaptors</groupId>
     <artifactId>saltstack-adapter-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
     </name>
@@ -66,6 +66,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
 
         <!-- Needed to run SSH -->
         <!-- VERSION CONFLICT !!!!! -->
@@ -98,13 +102,11 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <scope>provided</scope> 
-       </dependency>
+        </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml
new file mode 100755 (executable)
index 0000000..e360f81
--- /dev/null
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : CCSDK
+  ================================================================================
+  Copyright (C) 2017 - 2018 Samsung Electronics. All rights
+                          reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+
+    <bean id="propProvider"
+          class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterPropertiesProviderImpl"/>
+
+    <bean id="saltstackAdapterInstance"
+          class="org.onap.ccsdk.sli.adaptors.saltstack.impl.SaltstackAdapterImpl">
+        <argument ref="propProvider"/>
+    </bean>
+
+    <service ref="saltstackAdapterInstance">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdapter
+            </value>
+        </interfaces>
+    </service>
+
+</blueprint>

diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml
index 69defc4..4ca6c9f 100644 (file)
--- a/sql-resource/features/ccsdk-sql-resource/pom.xml
+++ b/sql-resource/features/ccsdk-sql-resource/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.adaptors</groupId>
     <artifactId>ccsdk-sql-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>

diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml
index c68504e..75ee45d 100755 (executable)
--- a/sql-resource/features/features-sql-resource/pom.xml
+++ b/sql-resource/features/features-sql-resource/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.adaptors</groupId>
     <artifactId>features-sql-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>

diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml
index 48a896b..e603e0a 100755 (executable)
--- a/sql-resource/features/pom.xml
+++ b/sql-resource/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.adaptors</groupId>
     <artifactId>sql-resource-features</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>

diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml
index 071f084..7f157d0 100755 (executable)
--- a/sql-resource/installer/pom.xml
+++ b/sql-resource/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.adaptors</groupId>
     <artifactId>sql-resource-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>

diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml
index 8304259..645576e 100755 (executable)
--- a/sql-resource/pom.xml
+++ b/sql-resource/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.adaptors</groupId>
     <artifactId>sql-resource</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource</name>

diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml
index 5197a1d..d49d018 100755 (executable)
--- a/sql-resource/provider/pom.xml
+++ b/sql-resource/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.adaptors</groupId>
     <artifactId>sql-resource-provider</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name>

diff --git a/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml b/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml
new file mode 100755 (executable)
index 0000000..5e8d339
--- /dev/null
+++ b/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights
+                          reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<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.adaptors.resource.sql.SqlResourcePropertiesProviderImpl" />
+    <reference id="dblibService" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" />
+
+    <bean id="sqlResourceInstance" class="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource">
+        <argument ref="propProvider"/>
+        <argument ref="dblibService"/>
+    </bean>
+
+    <service ref="sqlResourceInstance">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource</value>
+        </interfaces>
+    </service>
+
+</blueprint>

diff --git a/version.properties b/version.properties
index 74fd999..54c44bc 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 release_name=0
-sprint_number=5
-feature_revision=2
+sprint_number=6
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}