Fix compiler errors in aclservice

[netvirt.git] / vpnservice / aclservice / impl / src / main / resources / org / opendaylight / blueprint / aclservice.xml

diff --git a/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml b/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
index d33a5d69fc5f660a6406a761f3734e7805fcba74..0baaf414410761e2ae10b25c6d785e29682ca5ae 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
+++ b/vpnservice/aclservice/impl/src/main/resources/org/opendaylight/blueprint/aclservice.xml
@@ -1,50 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  odl:use-default-for-reference-types="true">
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+           odl:use-default-for-reference-types="true">
 
   <reference id="dataBroker"
     interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" />
-  <reference id="mdsalManager"
+  <reference id="iMdsalApiManager"
     interface="org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager" />
-  <bean id="aclServiceFactory"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" init-method="start" destroy-method="close">
-    <argument ref="dataBroker" />
-    <argument ref="mdsalManager" />
-  </bean>
-  <bean id="ingressAclService"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" factory-ref="aclServiceFactory" factory-method="createIngressAclServiceImpl">
-  </bean>
-  <bean id="egressAclService"
-    class="org.opendaylight.netvirt.aclservice.AclServiceImplFactory" factory-ref="aclServiceFactory" factory-method="createEgressAclServiceImpl">
-  </bean>
-  <bean id="aclServiceManager"
-    class="org.opendaylight.netvirt.aclservice.AclServiceManagerImpl">
-    <argument ref="ingressAclService" />
-    <argument ref="egressAclService" />
-  </bean>
-  <bean id="aclInterfaceStateListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclInterfaceStateListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclNodeListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclNodeListener"
-    init-method="start" destroy-method="close">
-    <argument ref="mdsalManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclInterfaceListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclInterfaceListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
-  <bean id="aclEventListener"
-    class="org.opendaylight.netvirt.aclservice.listeners.AclEventListener"
-    init-method="start" destroy-method="close">
-    <argument ref="aclServiceManager" />
-    <argument ref="dataBroker" />
-  </bean>
+  <reference id="entityOwnershipService"
+             interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService" />
+  <reference id="iInterfaceManager"
+             interface="org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager" />
+  <reference id="jobCoordinator"
+             interface="org.opendaylight.infrautils.jobcoordinator.JobCoordinator" />
+
+  <odl:rpc-service id="idManagerService"
+    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
+  <odl:rpc-service id="opendaylightDirectStatisticsService"
+    interface="org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.OpendaylightDirectStatisticsService" />
+
+  <odl:clustered-app-config id="aclserviceConfig"
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig"
+                            default-config-file-name="netvirt-aclservice-config.xml"
+                            update-strategy="none">
+  </odl:clustered-app-config>
+
+  <odl:rpc-implementation ref="aclLiveStatisticsRpcServiceImpl" />
+
+  <service ref="aclServiceUtilFacade"
+        interface="org.opendaylight.netvirt.aclservice.api.utils.IAclServiceUtil" />
+
+  <service ref="aclDataUtil"
+           interface="org.opendaylight.netvirt.aclservice.api.utils.AclDataCache" />
+
+  <odl:notification-listener ref="aclVpnChangeListener" />
 </blueprint>