Remove legacy distribution

I think (I checked with flaviof on IRC) this is just
making build times longer and is not used.  If so,
this patch should make builds faster.

If its doing something useful, let me know ;)

Change-Id: I950f2e0404b1eceb9708e47ab154865ff01c12ed
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
deleted file mode 100755 (executable)
index 86a5730..0000000
--- a/distribution/opendaylight/pom.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Adapted from David Erickson's Distribution pom.xml
-see https://git.opendaylight.org/gerrit/#/c/390/
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>commons</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../../commons/parent/</relativePath>
-  </parent>
-
-  <artifactId>distribution.ovsdb</artifactId>
-  <packaging>pom</packaging>
-  <name>OpenDaylight OVSDB Distribution</name>
-
-  <properties>
-    <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
-    <openflowj.version>1.0.2</openflowj.version>
-  </properties>
-
-  <dependencies>
-    <!-- openflowjava -->
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>util</artifactId>
-      <version>${openflowjava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-api</artifactId>
-      <version>${openflowjava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-impl</artifactId>
-      <version>${openflowjava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-      <version>${openflowjava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.openflow.openflowj</artifactId>
-      <version>${openflowj.version}</version>
-    </dependency>
-    <!-- openflowplugin -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-api</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-api</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowjava-extension-nicira-api</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowjava-extension-nicira</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-controller-config</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>library</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-providers</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>northbound</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>plugin</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovssfc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>plugin-mdsal-adapter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.openvswitch</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.hardwarevtep</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>sfc-model</artifactId>
-      <version>${sfc-model.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>distribution.opendaylight</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
-      <classifier>osgipackage</classifier>
-      <type>zip</type>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <filtering>true</filtering>
-        <directory>${project.build.directory}/generated-resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>unpack-shared-resources</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-              <includeArtifactIds>distribution.opendaylight</includeArtifactIds>
-              <includeGroupIds>org.opendaylight.controller</includeGroupIds>
-              <excludeTransitive>true</excludeTransitive>
-              <ignorePermissions>false</ignorePermissions>
-              <skip>${skip.distribution}</skip>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-provided-configs</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-resources/opendaylight/configuration</outputDirectory>
-              <includeArtifactIds>
-                openflowplugin-controller-config, test-extension, openflowjava-extension-nicira, openflowjava-extension-nicira-api, openflowplugin-extension-nicira,
-                ovssfc
-             </includeArtifactIds>
-              <includes>**\/*.xml</includes>
-              <excludeTransitive>true</excludeTransitive>
-              <ignorePermissions>false</ignorePermissions>
-              <skip>${skip.distribution}</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>distro-assembly</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
-              <skipAssembly>${skip.distribution}</skipAssembly>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-  </scm>
-</project>

diff --git a/distribution/opendaylight/src/assemble/bin.xml b/distribution/opendaylight/src/assemble/bin.xml
deleted file mode 100644 (file)
index a392baf..0000000
--- a/distribution/opendaylight/src/assemble/bin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>osgipackage</id>
-  <formats>
-    <format>dir</format>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/generated-resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-          <exclude>opendaylight/plugins/*ovsdb*</exclude>
-          <exclude>opendaylight/run.sh</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>
-        src/main/resources/
-      </directory>
-      <outputDirectory>
-        opendaylight/
-      </outputDirectory>
-    </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>
-    <file>
-      <source>${basedir}/src/assemble/resources/run.base.sh</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <fileMode>0755</fileMode>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>opendaylight/plugins</outputDirectory>
-      <outputFileNameMapping>
-        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-      </outputFileNameMapping>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-    </dependencySet>
-  </dependencySets>
-</assembly>

diff --git a/distribution/opendaylight/src/assemble/resources/run.base.sh b/distribution/opendaylight/src/assemble/resources/run.base.sh
deleted file mode 100755 (executable)
index b2deedd..0000000
--- a/distribution/opendaylight/src/assemble/resources/run.base.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Use same path for run.internal.sh
-RUNSH_DIR=$(dirname $0)
-CONTROLLER_RUNSH=${RUNSH_DIR}/run.internal.sh
-
-OF_FILTER=
-OF_PLUGIN_RUNTIME=
-
-# Be extra careful to pass on usage from run.internal.sh, but add our
-# usage as well in the standard way
-function usage {
-    $CONTROLLER_RUNSH -help | sed 's/\[-help\]/\[-help\] \[-of10\] \[-bundlefilter \<bundlefilter\> \]/' | sed "s;$CONTROLLER_RUNSH;$0;"
-    exit 1
-}
-
-OF13=1
-BUNDLEFILTER=
-while true ; do
-    (( i += 1 ))
-    case "${@:$i:1}" in
-        -of10) OF13=0 ; (( i += 1 ));;
-        -of13) OF13=1 ; (( i += 1 ));;
-        -bundlefilter) (( i += 1 )); BUNDLEFILTER="|${@:$i:1}";;
-        -help) (( i += 1 )); helparg=${@:$i:1}; usage ;;
-        "") break ;;
-    esac
-done
-
-# clean available optional configurations (links)
-find configuration/initial -type l -exec rm {} \;
-
-# OF Filter selection
-OF_FILTER="org.opendaylight.(openflowplugin|openflowjava|controller.sal-compatibility)"
-OF_PLUGIN_RUNTIME="1.0"
-if (( $OF13 != 0 )); then
-    OF_PLUGIN_RUNTIME="1.3"
-    OF_FILTER="org.opendaylight.controller.(thirdparty.org.openflow|protocol_plugins.openflow)"
-    while read ofConfig; do
-        ln -s ../initial.available/$(basename ${ofConfig}) configuration/initial/
-    done < <(find configuration/initial.available -name '*openflowplugin.xml')
-fi
-
-# Make sure we suck out our additional args so as to not confuse
-# run.internal.sh
-NEWARGS=`echo $@|sed 's/-of13//'|sed 's/-of10//'|sed 's/-bundlefilter[ ]*[^ ]*//'`
-
-
-# Build the filter string
-FILTERBEGINING='^(?!'
-FILTERENDING=').*'
-FILTER=${FILTERBEGINING}${OF_FILTER}${BUNDLEFILTER}${FILTERENDING}
-
-# Run the command
-$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" -Dovsdb.of.version="$OF_PLUGIN_RUNTIME" $NEWARGS

diff --git a/distribution/opendaylight/src/assemble/resources/run.sh b/distribution/opendaylight/src/assemble/resources/run.sh
deleted file mode 100755 (executable)
index 782e994..0000000
--- a/distribution/opendaylight/src/assemble/resources/run.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Use same path for run.base.sh
-RUNSH_DIR=$(dirname $0)
-RUN_BASE_SH=${RUNSH_DIR}/run.base.sh
-
-function usage {
-    echo -e "You must select one of the 3 supported network virtualization technologies:\n\tovsdb | opendove | vtn"
-    echo "Usage: $0 -virt {ovsdb | opendove | vtn | affinity} [advanced options]"
-    echo "Advanced options: $($RUN_BASE_SH -help | sed "s;Usage: $RUN_BASE_SH ;;")"
-    exit 1
-}
-
-virtIndex=0
-while true ; do
-    (( i += 1 ))
-    case "${@:$i:1}" in
-        -virt) virtIndex=$i ;;
-        "") break ;;
-    esac
-done
-
-# Virtualization edition select
-if [ ${virtIndex} -eq 0 ]; then
-    usage
-fi
-
-virt=${@:$virtIndex+1:1}
-if [ "${virt}" == "" ]; then
-    usage
-else
-    if [ "${virt}" == "ovsdb" ]; then
-        ODL_VIRT_FILTER="opendove|vtn|affinity|ovsdb.ovssfc"
-    elif [ "${virt}" == "sfc" ]; then
-        ODL_VIRT_FILTER="opendove|vtn|affinity|ovsdb.openstack"
-    elif [ "${virt}" == "opendove" ]; then
-        ODL_VIRT_FILTER="ovsdb|vtn"
-    elif [ "${virt}" == "vtn" ]; then
-        ODL_VIRT_FILTER="affinity|opendove|ovsdb.ovsdb.neutron|controller.(arphandler|samples)"
-    elif [ "${virt}" == "affinity" ]; then
-        ODL_VIRT_FILTER="vtn|opendove|controller.samples"
-    else
-        usage
-    fi
-fi
-
-$RUN_BASE_SH -bundlefilter "org.opendaylight.(${ODL_VIRT_FILTER})" "${@:1:$virtIndex-1}" "${@:virtIndex+2}"