From 6b8e4f12fc66a64fa5c5498d06891f1f5f1189ac Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Thu, 2 Mar 2023 12:06:07 +0530
Subject: Upgrade parents to 2.5.4-SNAPSHOT

Code changes as a result of changes induced by ODL Chlorine SR1

Issue-ID: CCSDK-3856
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Ic08786f050e58bdb8371c8f8c25fb0db9f258cd4
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 .../org/opendaylight/blueprint/impl-blueprint.xml  | 34 ++--------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

(limited to 'sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight')

diff --git a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index d5f8a991a..5a681d76f 100644
--- a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -29,42 +29,20 @@
     <reference id="rpcProviderService"
                interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
- 
-    <bean id="aboutServlet"
-          class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.about.AboutHttpServlet">
-    </bean>
-    <service interface="javax.servlet.http.HttpServlet"
-             ref="aboutServlet">
-        <service-properties>
-            <entry key="alias" value="/about"/>
-        </service-properties>
-    </service>
+
+    <bean id="aboutServlet" class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.about.AboutHttpServlet" />
 
     <bean id="msServlet"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.MsServlet">
     </bean>
-    <service interface="javax.servlet.http.HttpServlet" ref="msServlet">
-        <service-properties>
-            <entry key="alias" value="/ms"/>
-        </service-properties>
-    </service>
+
     <bean id="treeServlet"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.DataTreeHttpServlet">
     </bean>
-    <service interface="javax.servlet.http.HttpServlet" ref="treeServlet">
-        <service-properties>
-            <entry key="alias" value="/tree"/>
-        </service-properties>
-    </service>
 
     <bean id="userdataServlet"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.UserdataHttpServlet">
     </bean>
-    <service interface="javax.servlet.http.HttpServlet" ref="userdataServlet">
-        <service-properties>
-            <entry key="alias" value="/userdata"/>
-        </service-properties>
-    </service>
 
     <bean id="provider"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.impl.DataProviderImpl"
@@ -80,12 +58,6 @@
     <bean id="yangServlet"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.yangschema.YangSchemaHttpServlet">
     </bean>
-    <service interface="javax.servlet.http.HttpServlet"
-             ref="yangServlet">
-        <service-properties>
-            <entry key="alias" value="/yang-schema"/>
-        </service-properties>
-    </service>
 
     <service ref="provider"
              interface="org.onap.ccsdk.features.sdnr.wt.dataprovider.model.IEntityDataProvider"/>
-- 
cgit 1.2.3-korg