X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Folm-blueprint.xml;fp=olm%2Fsrc%2Fmain%2Fresources%2FOSGI-INF%2Fblueprint%2Folm-blueprint.xml;h=986cbf56d9a2217931251f361b6ea93d6c220849;hb=a730902f28b82642e6abd3f1af41f52de24d8eca;hp=ca76f85b46130ea9783bc1415682122e3f157e95;hpb=e74b194cfc45e998e9e6c1a537231f2d97f5f717;p=transportpce.git

diff --git a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
index ca76f85b4..986cbf56d 100644
--- a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
+++ b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
@@ -7,43 +7,14 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
-
-    <cm:property-placeholder persistent-id="org.opendaylight.transportpce" update-strategy="reload">
-        <cm:default-properties>
-            <cm:property name="timer1" value="" />
-            <cm:property name="timer2" value="" />
-            <!--The following values are used to speed-up tests with simulators without convergence times-->
-            <!--cm:property name="timer1" value="3000" /-->
-            <!--cm:property name="timer2" value="2000" /-->
-        </cm:default-properties>
-    </cm:property-placeholder>
-
-
-  <reference id="dataBroker"
-        interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-  <reference id="rpcProviderService"
-        interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
-  <reference id="openRoadmInterfaces"
-        interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
-  <reference id="crossConnect"
-        interface="org.opendaylight.transportpce.common.crossconnect.CrossConnect" />
-  <reference id="deviceTransactionManager"
-        interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
-  <reference id="portMapping"
-        interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
+  <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
+  <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
+  <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
   <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
-
-  <bean id="powerMgmt" class="org.opendaylight.transportpce.olm.power.PowerMgmtImpl" >
-    <argument ref="dataBroker" />
-    <argument ref="openRoadmInterfaces" />
-    <argument ref="crossConnect" />
-    <argument ref="deviceTransactionManager" />
-    <argument ref="portMapping" />
-    <argument value="${timer1}"/>
-    <argument value="${timer2}"/>
-  </bean>
+  <reference id="powerMgmt" interface="org.opendaylight.transportpce.olm.power.PowerMgmt" />
 
   <bean id="olmPowerServiceImpl" class="org.opendaylight.transportpce.olm.service.OlmPowerServiceImpl">
     <argument ref="dataBroker" />