Do not use blueprint-maven-plugin in topology-manager

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

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

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index 48d7fb4091f235eabd07d7cef30d514b3b281db1..126e7dd7f19ba48ec7d1fd9f8f58ef58b35eed4f 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -66,21 +66,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-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java
index 83bcb9f81cc9061c03dfe774bcddb3ae24094b0d..d765949c07740e54dee76047d95d9a5689beb2a3 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java
@@ -15,7 +15,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.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -51,11 +50,10 @@ public class FlowCapableTopologyProvider implements ClusterSingletonService, Aut
     private ClusterSingletonServiceRegistration singletonServiceRegistration;
 
     @Inject
-    public FlowCapableTopologyProvider(@Reference final DataBroker dataBroker,
-                                       @Reference final NotificationService notificationService,
+    public FlowCapableTopologyProvider(final DataBroker dataBroker,
+                                       final NotificationService notificationService,
                                        final OperationProcessor processor,
-                                       @Reference final ClusterSingletonServiceProvider
-                                               clusterSingletonServiceProvider) {
+                                       final ClusterSingletonServiceProvider clusterSingletonServiceProvider) {
         this.dataBroker = dataBroker;
         this.notificationService = notificationService;
         this.processor = processor;

diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java
index 9814d1fe8fe7c723d3012568c82af1e61838d855..18a5766f39010b7661f2a9a1bed68155105b0936 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java
@@ -11,7 +11,6 @@ import java.util.Collection;
 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.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -31,7 +30,7 @@ public class NodeChangeListenerImpl extends DataTreeChangeListenerImpl<FlowCapab
     private static final Logger LOG = LoggerFactory.getLogger(NodeChangeListenerImpl.class);
 
     @Inject
-    public NodeChangeListenerImpl(@Reference final DataBroker dataBroker, final OperationProcessor operationProcessor) {
+    public NodeChangeListenerImpl(final DataBroker dataBroker, final OperationProcessor operationProcessor) {
         // TODO: listener on FlowCapableNode. what if node id in Node.class is changed (it won't be caught by this
         // listener)
         super(operationProcessor, dataBroker,

diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/OperationProcessor.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/OperationProcessor.java
index 3312779c8ef1c98926ac3cb1d5bd558ad3dde016..6890544f36c9a3105726bfb8f71de208019e566c 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/OperationProcessor.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/OperationProcessor.java
@@ -13,7 +13,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.DataBroker;
 import org.opendaylight.openflowplugin.common.txchain.TransactionChainManager;
 import org.slf4j.Logger;
@@ -32,7 +31,7 @@ public final class OperationProcessor implements AutoCloseable, Runnable {
     private volatile boolean finishing = false;
 
     @Inject
-    public OperationProcessor(@Reference final DataBroker dataBroker) {
+    public OperationProcessor(final DataBroker dataBroker) {
         transactionChainManager = new TransactionChainManager(dataBroker, TOPOLOGY_MANAGER);
         transactionChainManager.activateTransactionManager();
         transactionChainManager.initialSubmitWriteTransaction();

diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java
index 16e52aa31a188f21971598d1d5039dc6ec4cd80b..6b0472e4f2ec809ce77be06a72d917682bc3c01c 100644 (file)
--- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java
+++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java
@@ -13,7 +13,6 @@ import java.util.concurrent.ExecutionException;
 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.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -38,7 +37,7 @@ public class TerminationPointChangeListenerImpl extends DataTreeChangeListenerIm
     private static final Logger LOG = LoggerFactory.getLogger(TerminationPointChangeListenerImpl.class);
 
     @Inject
-    public TerminationPointChangeListenerImpl(@Reference final DataBroker dataBroker,
+    public TerminationPointChangeListenerImpl(final DataBroker dataBroker,
                                               final OperationProcessor operationProcessor) {
         super(operationProcessor, dataBroker,
               InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class)

diff --git a/applications/topology-manager/src/main/resources/blueprint/autowire.xml b/applications/topology-manager/src/main/resources/blueprint/autowire.xml
new file mode 100644 (file)
index 0000000..8a35171
--- /dev/null
+++ b/applications/topology-manager/src/main/resources/blueprint/autowire.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="flowCapableTopologyProvider" class="org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableTopologyProvider" init-method="start" destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="notificationService"/>
+        <argument ref="operationProcessor"/>
+        <argument ref="clusterSingletonServiceProvider"/>
+    </bean>
+    <bean id="nodeChangeListenerImpl" class="org.opendaylight.openflowplugin.applications.topology.manager.NodeChangeListenerImpl" destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="operationProcessor"/>
+    </bean>
+    <bean id="operationProcessor" class="org.opendaylight.openflowplugin.applications.topology.manager.OperationProcessor" init-method="start" destroy-method="close">
+        <argument ref="dataBroker"/>
+    </bean>
+    <bean id="terminationPointChangeListenerImpl" class="org.opendaylight.openflowplugin.applications.topology.manager.TerminationPointChangeListenerImpl" destroy-method="close">
+        <argument ref="dataBroker"/>
+        <argument ref="operationProcessor"/>
+    </bean>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+    <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+</blueprint>