Do not use blueprint-maven-plugin in topology-lldp-discovery

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

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

diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index 241b1408d38bed20722f1b4d6dd48ff31291434b..a8dfb754843809c4ee2971fa28dcee7e20af7262 100644 (file)
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -52,22 +52,8 @@
       <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>
-      </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/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPActivator.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPActivator.java
index 5733c6a185a219f3e22d20c66fdb6ac0f8dc1fba..5d6f82dfa9f472500ed682ef5182b7052ff85059 100644 (file)
--- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPActivator.java
+++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPActivator.java
@@ -11,7 +11,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 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.NotificationService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.lldp.discovery.config.rev160511.TopologyLldpDiscoveryConfig;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -29,7 +28,7 @@ public class LLDPActivator implements AutoCloseable {
 
     @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
     @Inject
-    public LLDPActivator(@Reference NotificationService notificationService,
+    public LLDPActivator(NotificationService notificationService,
                          LLDPDiscoveryListener lldpDiscoveryListener,
                          TopologyLldpDiscoveryConfig topologyLldpDiscoveryConfig) {
         lldpSecureKey = topologyLldpDiscoveryConfig.getLldpSecureKey();

diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
index 5d5bc18429c265f6ec77788cd51f6952a9187a69..2766e169eefd77445d8f5e6cbb7814453f99a8fe 100644 (file)
--- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
+++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.applications.topology.lldp;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.openflowplugin.applications.topology.lldp.utils.LLDPDiscoveryUtils;
@@ -32,8 +31,8 @@ public class LLDPDiscoveryListener implements PacketProcessingListener {
     private final EntityOwnershipService eos;
 
     @Inject
-    public LLDPDiscoveryListener(@Reference final NotificationPublishService notificationService,
-            final LLDPLinkAger lldpLinkAger, @Reference final EntityOwnershipService entityOwnershipService) {
+    public LLDPDiscoveryListener(final NotificationPublishService notificationService,
+            final LLDPLinkAger lldpLinkAger, final EntityOwnershipService entityOwnershipService) {
         this.notificationService = notificationService;
         this.lldpLinkAger = lldpLinkAger;
         this.eos = entityOwnershipService;

diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPLinkAger.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPLinkAger.java
index c6a38365cefbd9c5d3b796e3fc5a0726b0d33d23..fbc382f6b544a78deec4d2d1608298e84a9c6771 100644 (file)
--- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPLinkAger.java
+++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPLinkAger.java
@@ -18,7 +18,6 @@ import java.util.concurrent.ConcurrentHashMap;
 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.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataBroker;
@@ -69,10 +68,10 @@ public class LLDPLinkAger implements ConfigurationListener, ClusteredDataTreeCha
     @Inject
     @SuppressWarnings("checkstyle:IllegalCatch")
     public LLDPLinkAger(final TopologyLldpDiscoveryConfig topologyLldpDiscoveryConfig,
-                        @Reference final NotificationPublishService notificationService,
-                        @Reference final ConfigurationService configurationService,
-                        @Reference final EntityOwnershipService entityOwnershipService,
-                        @Reference final DataBroker dataBroker) {
+                        final NotificationPublishService notificationService,
+                        final ConfigurationService configurationService,
+                        final EntityOwnershipService entityOwnershipService,
+                        final DataBroker dataBroker) {
         this.linkExpirationTime = topologyLldpDiscoveryConfig.getTopologyLldpExpirationInterval().getValue().toJava();
         this.notificationService = notificationService;
         this.configurationServiceRegistration = configurationService.registerListener(this);

diff --git a/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml
new file mode 100644 (file)
index 0000000..d04d335
--- /dev/null
+++ b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="lLDPActivator" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPActivator" destroy-method="close">
+        <argument ref="notificationService"/>
+        <argument ref="lLDPDiscoveryListener"/>
+        <argument ref="topologyLldpDiscoveryConfig"/>
+    </bean>
+    <bean id="lLDPDiscoveryListener" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPDiscoveryListener">
+        <argument ref="notificationPublishService"/>
+        <argument ref="lLDPLinkAger"/>
+        <argument ref="entityOwnershipService"/>
+    </bean>
+    <bean id="lLDPLinkAger" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPLinkAger" destroy-method="close">
+        <argument ref="topologyLldpDiscoveryConfig"/>
+        <argument ref="notificationPublishService"/>
+        <argument ref="configurationService"/>
+        <argument ref="entityOwnershipService"/>
+        <argument ref="dataBroker"/>
+    </bean>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+    <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+    <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+    <reference id="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+</blueprint>