From c74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 11 Jul 2019 08:47:49 -0400
Subject: Update to Neon

Apply code updates to port to Neon.

Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146
Issue-ID: CCSDK-1389
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 blueprints-processor/plugin/model-provider/pom.xml | 42 ++++++++++++-
 .../OSGI-INF/blueprint/impl-blueprint.xml          | 68 ++++++++++++++++++++++
 2 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml

(limited to 'blueprints-processor/plugin/model-provider')

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 6cf25f473..0f9c9430d 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -21,12 +21,12 @@
     <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.features</groupId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <artifactId>blueprints-model-provider</artifactId>
     <packaging>bundle</packaging>
     <name>Blueprints Model - Provider</name>
@@ -66,6 +66,43 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.21.0-GA</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-support</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-reflect</artifactId>
+            <version>1.6.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+            <version>1.6.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -106,7 +143,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..5a07f94c6
--- /dev/null
+++ b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2017-2018 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  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">
+
+	<!-- Dependency -->
+
+	<reference id="configResourceService"
+		interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+	<reference id="configRestAdaptorService"
+		interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+	<!-- Expose the Common Component Bean -->
+	<bean id="configModelNode"
+		class="org.onap.ccsdk.features.model.service.ConfigModelNode">
+	</bean>
+
+	<service ref="configModelNode"
+		interface="org.onap.ccsdk.features.model.service.ConfigModelNode" />
+
+	<bean id="configModelService"
+		class="org.onap.ccsdk.features.model.service.ConfigModelServiceImpl">
+		<argument ref="configRestAdaptorService" />
+	</bean>
+
+	<service ref="configModelService"
+		interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+
+	<!-- ComponentNode -->
+
+	<bean id="componentNodeService"
+		class="org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl">
+		<argument ref="blueprintBundleContext" />
+		<argument ref="configResourceService" />
+		<argument ref="configRestAdaptorService" />
+	</bean>
+
+	<service ref="componentNodeService"
+		interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+	<bean id="componentNodeDelegate"
+		class="org.onap.ccsdk.features.model.service.ComponentNodeDelegate">
+		<argument ref="componentNodeService" />
+	</bean>
+
+	<service ref="componentNodeDelegate"
+		interface="org.onap.ccsdk.features.model.service.ComponentNodeDelegate" />
+
+</blueprint>
-- 
cgit 1.2.3-korg