From b4d7ca85b122f914fb43a4a3f4300e36dede9e2b Mon Sep 17 00:00:00 2001
From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Thu, 28 Feb 2019 17:43:35 +0100
Subject: Replace depreciated MDSAL interfaces

SDN-R websocketmanager2

Change-Id: I69c12ee993bf8e2740d8f72778d06c89bf758051
Issue-ID: SDNC-680
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
---
 .../org/opendaylight/blueprint/impl-blueprint.xml  | 30 +++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'sdnr/wt/websocketmanager2/provider/src/main/resources/org')

diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 315921dbb..5e95b7b74 100644
--- a/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -7,9 +7,9 @@
   =================================================================================================
   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
@@ -20,30 +20,14 @@
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 
-<!--   <bean id="wsServlet" -->
-<!--     class="org.onap.ccsdk.sdnr.wt.websocketmanager2.WebSocketManager"> -->
-<!--   </bean> -->
-
-  <reference id="rpcProviderRegistry"
-    interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
-    odl:type="default" />
+  <reference id="rpcProviderRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" odl:type="default" />
 
-  <bean id="provider"
-    class="org.onap.ccsdk.features.sdnr.wt.websocketmanager2.WebSocketManagerProvider"
-    init-method="init" destroy-method="close">
+  <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.websocketmanager2.WebSocketManagerProvider" init-method="init" destroy-method="close">
     <property name="rpcProviderRegistry" ref="rpcProviderRegistry" />
-<!--     <property name="wsServlet" ref="wsServlet" /> -->
   </bean>
 
-   <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService">
-      <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService"/>
-    </reference>
-<!--   <service -->
-<!--     interface="org.eclipse.jetty.websocket.servlet.WebSocketServlet" -->
-<!--     ref="wsServlet"> -->
-<!--     <service-properties> -->
-<!--       <entry key="alias" value="/websocket" /> -->
-<!--     </service-properties> -->
-<!--   </service> -->
+  <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService">
+    <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService" />
+  </reference>
 
 </blueprint>
-- 
cgit 1.2.3-korg