Nitrogen port : sli/plugins

Update properties-node and restapi-call-node to compile against
ODL Nitrogen

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

4 files changed, 27 insertions, 121 deletions

diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index d622e59e9..c354dc1fc 100755
--- a/properties-node/provider/pom.xml
+++ b/properties-node/provider/pom.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

     <modelVersion>4.0.0</modelVersion>

+

     <parent>

-        <groupId>org.onap.ccsdk.sli.plugins</groupId>

-        <artifactId>properties-node</artifactId>

-        <version>0.2.0-SNAPSHOT</version>

+        <groupId>org.onap.ccsdk.parent</groupId>

+        <artifactId>binding-parent</artifactId>

+        <version>1.0.1-SNAPSHOT</version>

     </parent>

+

     <groupId>org.onap.ccsdk.sli.plugins</groupId>

-    <version>0.2.0-SNAPSHOT</version>

     <artifactId>properties-node-provider</artifactId>

+    <version>0.2.1-SNAPSHOT</version>

     <packaging>bundle</packaging>

-    <name>Properties Node - Provider</name>

+

+    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>

     <url>http://maven.apache.org</url>

+

     <properties>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

     </properties>

+

     <dependencies>

         <dependency>

             <groupId>junit</groupId>

@@ -22,68 +27,17 @@
             <scope>test</scope>

         </dependency>

         <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-test</artifactId>

-            <version>${spring.version}</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

             <groupId>org.onap.ccsdk.sli.core</groupId>

             <artifactId>sli-common</artifactId>

-            <version>${sdnctl.sli.version}</version>

-            <scope>compile</scope>

         </dependency>

         <dependency>

             <groupId>org.onap.ccsdk.sli.core</groupId>

             <artifactId>sli-provider</artifactId>

-            <version>${sdnctl.sli.version}</version>

-            <scope>compile</scope>

         </dependency>

         <dependency>

             <groupId>org.slf4j</groupId>

             <artifactId>slf4j-api</artifactId>

-            <version>${slf4j.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.slf4j</groupId>

-            <artifactId>jcl-over-slf4j</artifactId>

-            <version>${slf4j.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-beans</artifactId>

-            <version>${spring.version}</version>

         </dependency>

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-context</artifactId>

-            <version>${spring.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-

-

-

-            <plugin>

-                <groupId>org.apache.felix</groupId>

-                <artifactId>maven-bundle-plugin</artifactId>

-                <extensions>true</extensions>

-                <configuration>

-                    <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.sli.prop</Bundle-SymbolicName>

-                        <Export-Package>org.onap.ccsdk.sli.prop</Export-Package>

-                        <Import-Package>*</Import-Package>

-                    </instructions>

 

-

-                </configuration>

-

-            </plugin>

-

-

-        </plugins>

-

-    </build>

+    </dependencies>

 </project>

diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
deleted file mode 100644
index 52d1cd96a..000000000
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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=========================================================
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="propertiesNode" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode">
-    </bean>
-
-</beans>
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
deleted file mode 100644
index a46e37c7b..000000000
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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=========================================================
-  -->
-
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-             xsi:schemaLocation="http://www.springframework.org/schema/osgi
-       http://www.springframework.org/schema/osgi/spring-osgi.xsd
-       http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <service ref="propertiesNode" interface="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
-
-</beans:beans>
diff --git a/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml
new file mode 100755
index 000000000..6e1d48efd
--- /dev/null
+++ b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml
@@ -0,0 +1,16 @@
+<?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="propNodeProvider" class="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" />
+
+
+
+    <service ref="propNodeProvider">
+        <interfaces>
+            <value>org.onap.ccsdk.sli.plugins.prop.PropertiesNode</value>
+        </interfaces>
+    </service>
+
+</blueprint>
\ No newline at end of file