Do not use blueprint-maven-plugin in FRM

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I24478884865581c219e3048bf005c2ec3defb344
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index e50b1d55e063f31e8fd25dd88b13b127ed785237..138b8742dc28529d26329ab9ba845b7c1b541a34 100644 (file)
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -67,11 +67,6 @@
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>arbitratorreconciliation-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.aries.blueprint</groupId>
-      <artifactId>blueprint-maven-plugin-annotation</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
@@ -83,20 +78,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>blueprint-maven-plugin</artifactId>
-        <configuration>
-          <scanPaths>
-            <scanPath>org.opendaylight.openflowplugin.applications.frm</scanPath>
-          </scanPaths>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
index b5eaa2da02614a881b3fd75f73e768a9eee7f14f..7e4b9013253515b917990c6dc089acd559c574f5 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
@@ -19,7 +19,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
@@ -112,17 +111,17 @@ public class ForwardingRulesManagerImpl implements ForwardingRulesManager {
     private final ListenerRegistrationHelper registrationHelper;
 
     @Inject
-    public ForwardingRulesManagerImpl(@Reference final DataBroker dataBroker,
-                                      @Reference final RpcConsumerRegistry rpcRegistry,
-                                      @Reference final RpcProviderService rpcProviderService,
+    public ForwardingRulesManagerImpl(final DataBroker dataBroker,
+                                      final RpcConsumerRegistry rpcRegistry,
+                                      final RpcProviderService rpcProviderService,
                                       final ForwardingRulesManagerConfig config,
-                                      @Reference final MastershipChangeServiceManager mastershipChangeServiceManager,
-                                      @Reference final ClusterSingletonServiceProvider clusterSingletonService,
-                                      @Reference final ConfigurationService configurationService,
-                                      @Reference final ReconciliationManager reconciliationManager,
+                                      final MastershipChangeServiceManager mastershipChangeServiceManager,
+                                      final ClusterSingletonServiceProvider clusterSingletonService,
+                                      final ConfigurationService configurationService,
+                                      final ReconciliationManager reconciliationManager,
                                       final OpenflowServiceRecoveryHandler openflowServiceRecoveryHandler,
-                                      @Reference final ServiceRecoveryRegistry serviceRecoveryRegistry,
-                                      @Reference final FlowGroupCacheManager flowGroupCacheManager,
+                                      final ServiceRecoveryRegistry serviceRecoveryRegistry,
+                                      final FlowGroupCacheManager flowGroupCacheManager,
                                       final ListenerRegistrationHelper registrationHelper) {
         disableReconciliation = config.getDisableReconciliation();
         staleMarkingEnabled = config.getStaleMarkingEnabled();

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
index f61abcad9b7d3dac587384e8c65a146a11aebac1..37a14c0e410afa2a3815906e16e302811d5eee7a 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FrmReconciliationServiceImpl.java
@@ -14,7 +14,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Service;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
@@ -33,7 +32,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-@Service(classes = FrmReconciliationService.class)
 public class FrmReconciliationServiceImpl implements FrmReconciliationService {
 
     private static final Logger LOG = LoggerFactory.getLogger(FrmReconciliationServiceImpl.class);

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
index 46f73d1872379ad2edd310155ca6dac22d22ea5b..cf64fdf22b1b5cf0697bde431cb160555afc919b 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getInventoryConfigDataStoreStatus;
@@ -18,7 +17,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
 import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
@@ -38,7 +36,7 @@ public class ListenerRegistrationHelper {
     private final DataBroker dataBroker;
 
     @Inject
-    public ListenerRegistrationHelper(@Reference final DataBroker dataBroker) {
+    public ListenerRegistrationHelper(final DataBroker dataBroker) {
         this.dataBroker = dataBroker;
         listeningExecutorService = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(
                  new ThreadFactoryBuilder()

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/recovery/impl/OpenflowServiceRecoveryHandlerImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/recovery/impl/OpenflowServiceRecoveryHandlerImpl.java
index c1053e90d73693c594ba0c3c15701b2caff63da1..b9bd0f30831f78f121faf01ce9cb8681c8cdd54b 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/recovery/impl/OpenflowServiceRecoveryHandlerImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/recovery/impl/OpenflowServiceRecoveryHandlerImpl.java
@@ -9,8 +9,6 @@ package org.opendaylight.openflowplugin.applications.frm.recovery.impl;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
-import org.apache.aries.blueprint.annotation.service.Service;
 import org.opendaylight.openflowplugin.applications.frm.recovery.OpenflowServiceRecoveryHandler;
 import org.opendaylight.serviceutils.srm.RecoverableListener;
 import org.opendaylight.serviceutils.srm.ServiceRecoveryInterface;
@@ -20,7 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-@Service(classes = OpenflowServiceRecoveryHandler.class)
 public class OpenflowServiceRecoveryHandlerImpl implements ServiceRecoveryInterface,
         OpenflowServiceRecoveryHandler {
 
@@ -29,7 +26,7 @@ public class OpenflowServiceRecoveryHandlerImpl implements ServiceRecoveryInterf
     private final ServiceRecoveryRegistry serviceRecoveryRegistry;
 
     @Inject
-    public OpenflowServiceRecoveryHandlerImpl(@Reference final ServiceRecoveryRegistry serviceRecoveryRegistry) {
+    public OpenflowServiceRecoveryHandlerImpl(final ServiceRecoveryRegistry serviceRecoveryRegistry) {
         LOG.info("Registering openflowplugin service recovery handlers");
         this.serviceRecoveryRegistry = serviceRecoveryRegistry;
         serviceRecoveryRegistry.registerServiceRecoveryRegistry(buildServiceRegistryKey(), this);

diff --git a/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/autowire.xml
new file mode 100644 (file)
index 0000000..fd5447c
--- /dev/null
+++ b/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/autowire.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="forwardingRulesManagerImpl" class="org.opendaylight.openflowplugin.applications.frm.impl.ForwardingRulesManagerImpl" init-method="start" destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="rpcConsumerRegistry"/>
+        <argument ref="rpcProviderService"/>
+        <argument ref="forwardingRulesManagerConfig"/>
+        <argument ref="mastershipChangeServiceManager"/>
+        <argument ref="clusterSingletonServiceProvider"/>
+        <argument ref="configurationService"/>
+        <argument ref="reconciliationManager"/>
+        <argument ref="openflowServiceRecoveryHandlerImpl"/>
+        <argument ref="serviceRecoveryRegistry"/>
+        <argument ref="flowGroupCacheManager"/>
+        <argument ref="listenerRegistrationHelper"/>
+    </bean>
+    <bean id="frmReconciliationServiceImpl" class="org.opendaylight.openflowplugin.applications.frm.impl.FrmReconciliationServiceImpl">
+        <argument ref="forwardingRulesManagerImpl"/>
+    </bean>
+    <bean id="listenerRegistrationHelper" class="org.opendaylight.openflowplugin.applications.frm.impl.ListenerRegistrationHelper">
+        <argument ref="dataBroker"/>
+    </bean>
+    <bean id="openflowServiceRecoveryHandlerImpl" class="org.opendaylight.openflowplugin.applications.frm.recovery.impl.OpenflowServiceRecoveryHandlerImpl">
+        <argument ref="serviceRecoveryRegistry"/>
+    </bean>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+    <reference id="rpcConsumerRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
+    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
+    <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+    <reference id="flowGroupCacheManager" interface="org.opendaylight.openflowplugin.api.openflow.FlowGroupCacheManager"/>
+    <reference id="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+    <reference id="mastershipChangeServiceManager" interface="org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager"/>
+    <reference id="reconciliationManager" interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
+    <reference id="serviceRecoveryRegistry" interface="org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry"/>
+    <service ref="frmReconciliationServiceImpl" interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.frm.reconciliation.service.rev180227.FrmReconciliationService"/>
+    <service ref="openflowServiceRecoveryHandlerImpl" interface="org.opendaylight.openflowplugin.applications.frm.recovery.OpenflowServiceRecoveryHandler"/>
+</blueprint>