X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Fcommon-blueprint.xml;h=b57d2b577b70d0531b9b883291b65c2c845b67e6;hb=98b07b5da982529cdec2db98f5b96902ed47323b;hp=62688f3443fc4b474bd4a0888cf47518e7e8cc71;hpb=79e3715414de90d717b86c2eaff3d849fbf0a130;p=transportpce.git

diff --git a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
index 62688f344..b57d2b577 100644
--- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
+++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
@@ -9,15 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <reference id="mountPointService" interface="org.opendaylight.mdsal.binding.api.MountPointService" />
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />
+    <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
     <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
-
-    <bean id="deviceTransactionManager" class="org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl"
-          destroy-method="preDestroy" >
-        <argument ref="mountPointService" />
-        <argument value="15000" />
-    </bean>
+    <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
 
     <bean id="openRoadmInterfaces121" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121" >
         <argument ref="deviceTransactionManager" />
@@ -26,13 +20,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bean id="openRoadmInterfaces221" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221" >
         <argument ref="deviceTransactionManager" />
         <argument ref="portMapping" />
-        <argument ref="portMapping221" />
     </bean>
 
     <bean id="openRoadmInterfaces710" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710" >
         <argument ref="deviceTransactionManager" />
         <argument ref="portMapping" />
-        <argument ref="portMapping710" />
     </bean>
 
     <bean id="openRoadmInterfaces" class="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl" >
@@ -43,64 +35,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <argument ref="openRoadmInterfaces710" />
     </bean>
 
-    <bean id="portMapping121" class="org.opendaylight.transportpce.common.mapping.PortMappingVersion121" >
-        <argument ref="dataBroker" />
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="portMapping221" class="org.opendaylight.transportpce.common.mapping.PortMappingVersion221" >
-        <argument ref="dataBroker" />
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="portMapping710" class="org.opendaylight.transportpce.common.mapping.PortMappingVersion710" >
-        <argument ref="dataBroker" />
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="requestProcessor" class="org.opendaylight.transportpce.common.network.RequestProcessor" scope="singleton" >
-        <argument ref="dataBroker" />
-    </bean>
-
-    <bean id="networkTransactionImpl" class="org.opendaylight.transportpce.common.network.NetworkTransactionImpl">
-        <argument ref="requestProcessor" />
-    </bean>
-
-    <bean id="portMapping" class="org.opendaylight.transportpce.common.mapping.PortMappingImpl" >
-        <argument ref="dataBroker" />
-        <argument ref="portMapping221" />
-        <argument ref="portMapping121" />
-        <argument ref="portMapping710" />
-    </bean>
-
-    <bean id="crossConnect121" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121" >
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="crossConnect221" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221" >
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="crossConnect710" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl710" >
-        <argument ref="deviceTransactionManager" />
-    </bean>
-
-    <bean id="crossConnectImpl" class="org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl" >
-        <argument ref="deviceTransactionManager" />
-        <argument ref="mappingUtils" />
-        <argument ref="crossConnect121" />
-        <argument ref="crossConnect221" />
-        <argument ref="crossConnect710" />
-    </bean>
-
-    <service ref="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
-
-    <service ref="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
-
     <service ref="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
 
-    <service ref="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
-
-    <service ref="crossConnectImpl" interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
-
 </blueprint>