From f4817b420b59de111a0abe1eec761bd3e4458530 Mon Sep 17 00:00:00 2001
From: "Smokowski, Kevin (ks6305)" <ks6305@att.com>
Date: Tue, 14 Aug 2018 14:43:31 +0000
Subject: dme2 & ueb support

fix dme2 & ueb support in rest api call node

Change-Id: Ia387c0be8e907900e0b808879582048624dbef36
Issue-ID: CCSDK-459
Signed-off-by: Smokowski, Kevin (ks6305) <ks6305@att.com>
---
 .../META-INF/spring/restapi-call-node-context.xml  | 49 ----------------------
 .../spring/restapi-call-node-osgi-context.xml      | 32 --------------
 2 files changed, 81 deletions(-)
 delete mode 100644 restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
 delete mode 100644 restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml

(limited to 'restapi-call-node/provider/src/main/resources/META-INF/spring')

diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
deleted file mode 100644
index 87850624..00000000
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml
+++ /dev/null
@@ -1,49 +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"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-            <property name="locations">
-            <list>
-                <value>file:${SDNC_CONFIG_DIR}/ueb.properties</value>
-                <value>file:${SDNC_CONFIG_DIR}/dme2.properties</value>
-            </list>
-        </property>
-        <property name="ignoreResourceNotFound" value="true" />
-        <property name="ignoreUnresolvablePlaceholders" value="true" />
-    </bean>
-
-    <!-- context:property-placeholder location="file:${SDNC_CONFIG_DIR}/ueb.properties" /-->
-
-    <bean id="restapiCallNode" class="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode">
-        <property name="uebServers" value="${servers}" />
-        <property name="retryPolicyStore" ref="retryPolicyStore"/>
-    </bean>
-
-    <bean id="retryPolicyStore" class="org.onap.ccsdk.sli.plugins.restapicall.RetryPolicyStore">
-        <property name="proxyServers" value="${proxyUrl}" />
-    </bean>
-</beans>
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml
deleted file mode 100644
index 2f1e4dbd..00000000
--- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-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="restapiCallNode" interface="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" />
-
-</beans:beans>
-- 
cgit 1.2.3-korg