Do not use blueprint-maven-plugin in arb-reconcile-impl

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

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

diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index e84d66c592e1efe339f02ee119f33c35a6c31f05..f40963c1f0f27b0139c94bc15304947aa3fec077 100644 (file)
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -39,24 +39,5 @@
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>blueprint-maven-plugin-annotation</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>blueprint-maven-plugin</artifactId>
-                <configuration>
-                    <scanPaths>
-                        <scanPath>org.opendaylight.openflowplugin.applications.arbitratorreconciliation</scanPath>
-                    </scanPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
index be8168f19ba32664aceeb8affb806fae353e5b72..0c31367e60071145cbfa47727c590d8ef5e2e1d6 100644 (file)
--- a/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
+++ b/applications/arbitratorreconciliation/impl/src/main/java/org/opendaylight/openflowplugin/applications/arbitratorreconciliation/impl/ArbitratorReconciliationManagerImpl.java
@@ -32,7 +32,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.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.openflowplugin.api.OFConstants;
@@ -127,9 +126,9 @@ public class ArbitratorReconciliationManagerImpl implements ArbitratorReconcileS
             ObjectRegistration<? extends RpcService>> rpcRegistrations = new ConcurrentHashMap<>();
 
     @Inject
-    public ArbitratorReconciliationManagerImpl(@Reference final ReconciliationManager reconciliationManager,
-            @Reference final RpcProviderService rpcProviderService, @Reference final RpcConsumerRegistry rpcRegistry,
-            @Reference final UpgradeState upgradeState) {
+    public ArbitratorReconciliationManagerImpl(final ReconciliationManager reconciliationManager,
+            final RpcProviderService rpcProviderService, final RpcConsumerRegistry rpcRegistry,
+            final UpgradeState upgradeState) {
         Preconditions.checkArgument(rpcRegistry != null, "RpcConsumerRegistry cannot be null !");
         this.reconciliationManager = requireNonNull(reconciliationManager, "ReconciliationManager cannot be null!");
         this.salBundleService = requireNonNull(rpcRegistry.getRpcService(SalBundleService.class),

diff --git a/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
new file mode 100644 (file)
index 0000000..83c323e
--- /dev/null
+++ b/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="arbitratorReconciliationManagerImpl" class="org.opendaylight.openflowplugin.applications.arbitratorreconciliation.impl.ArbitratorReconciliationManagerImpl" init-method="start" destroy-method="close">
+        <argument ref="reconciliationManager"/>
+        <argument ref="rpcProviderService"/>
+        <argument ref="rpcConsumerRegistry"/>
+        <argument ref="upgradeState"/>
+    </bean>
+    <reference id="rpcConsumerRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
+    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
+    <reference id="reconciliationManager" interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
+    <reference id="upgradeState" interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
+</blueprint>