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>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index 02485257f1decb68af2b86ceb9086d01c1abc178..4889f0ff0ae70f027caeb547a9afb76369fa16a1 100644 (file)
--- 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 215b5bcf6459a7dac32b4914c652e4ecc40faaec..9a9564779de780f49fad48a412dce09a7d4bc97d 100644 (file)
--- 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>