Revert "Add -of13 switch to turn on OpenFlow 1.3 mode"

This reverts commit b9bf2770fd5e1971f2b3ceba2c7d85a1af1515aa.
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index 03da7c4abb5e17d585f2233646f3e2ef3c99b8dc..4d68bfba7ccde4559a23c3b5ce659f8a1e499594 100644 (file)
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -38,30 +38,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <artifactId>ovsdb.northbound</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
-    
-    <!-- openflowplugin -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    
-    <!-- openflowjava -->
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-impl</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-api</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index 19bf40efe2f5851b86464dd447590a72425f58ba..f96368a088d08c1fa64fb6ce35315d4d3c8e62d1 100644 (file)
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -43,22 +43,6 @@
     <fileSet>
       <directory>${project.build.directory}/generated-resources</directory>
       <outputDirectory>/</outputDirectory>
-      <excludes>
-          <exclude>opendaylight/run.sh</exclude>
-      </excludes>
     </fileSet>
   </fileSets>
-  <files>
-    <file>
-      <source>${project.build.directory}/generated-resources/opendaylight/run.sh</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <destName>run.internal.sh</destName>
-      <fileMode>0755</fileMode>
-    </file>
-    <file>
-      <source>${basedir}/src/assemble/resources/run.sh</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <fileMode>0755</fileMode>
-    </file>
-  </files>
 </assembly>

diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh
deleted file mode 100755 (executable)
index 353800b..0000000
--- a/distributions/base/src/assemble/resources/run.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-CONTROLLER_RUNSH=`echo $0|sed "s;run.sh;run.internal.sh;"`
-OF_FILTER=
-
-function usage {
-    $CONTROLLER_RUNSH -help | sed 's/\[-help\]/\[-help\] \[-of13\]/' | sed "s;$CONTROLLER_RUNSH;$0;"
-    exit 1
-}
-
-OF13=0
-while true ; do
-    (( i += 1 ))
-    case "${@:$i:1}" in
-        -of13) OF13=1 ;;
-        -help) usage ;;
-       "") break ;;
-    esac
-done
-
-# OF Filter selection
-OF_FILTER="^(?!org.opendaylight.(openflowplugin|openflowjava)).*"
-if [ $OF13 -ne 0 ]; then
-    OF_FILTER="^(?!org.opendaylight.controller.(thirdparty.org.openflow|protocol_plugins.openflow)).*"
-fi
-
-NEWARGS=`echo $@|sed 's/-of13//'`
-
-$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$OF_FILTER" $NEWARGS