From 793d1dbf1455f899644879ee46ca4a992db437e4 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 26 Jun 2014 14:00:09 -0500
Subject: [PATCH] Logically separate OF plugin from controller distribution
 bundle.

This plugin effectively results in no changes in output, but introduces
the correct logical separation of the OFplugin from controller.

When copying the controller distribution.opendaylight and unpacking
it, the legacy OF plugin is excluded at the file level.

However, then it is added in as a proper maven *dependency*.

This way, OFplugin default changes can be independent of whatever
is happening in controller opendaylight.distribution.

Change-Id: I4ae8167432eb0632a6768a05037daa0b8f630247
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 distributions/base/pom.xml              | 13 +++++++++++++
 distributions/base/src/assemble/bin.xml |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index 02485257..4889f0ff 100644
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -64,6 +64,19 @@ see https://git.opendaylight.org/gerrit/#/c/390/
       <artifactId>openflow-protocol-spi</artifactId>
       <version>0.5-SNAPSHOT</version>
     </dependency>
+
+    <!-- legacy openflow plugin -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>protocol_plugins.openflow</artifactId>
+      <version>0.4.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.openflow.openflowj</artifactId>
+      <version>1.0.2</version>
+    </dependency>
+
   </dependencies>
   <build>
     <resources>
diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index 215b5bcf..9a956477 100644
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -45,6 +45,8 @@
       <outputDirectory>/</outputDirectory>
       <excludes>
           <exclude>opendaylight/run.sh</exclude>
+          <exclude>opendaylight/plugins/org.opendaylight.controller.protocol_plugins.openflow-*.jar</exclude>
+          <exclude>opendaylight/plugins/org.opendaylight.controller.thirdparty.org.openflow.openflowj-*.jar</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-- 
2.36.6