Removing Old Hydrogen distributions from Master

Change-Id: I83da7d073eeaafc1855b91fc8ea33d72062aaba6
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
deleted file mode 100644 (file)
index b7837d4..0000000
--- a/distributions/base/pom.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--
-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.integration</groupId>
-    <artifactId>distributions</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <artifactId>distributions-base</artifactId>
-  <packaging>pom</packaging>
-  <name>OpenDaylight Base Edition</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>distribution.opendaylight</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
-    <!-- ovsdb -->
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>library</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>plugin</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>northbound</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.openvswitch</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>schema.hardwarevtep</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>of-extension.nx-ofjava</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>of-extension.nx-sal</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    
-    <!-- openflowplugin -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-api</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-api</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-controller-config</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowjava-extension-nicira-api</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowjava-extension-nicira</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- openflowjava -->
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-impl</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>util</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- legacy openflow plugin -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol_plugins.openflow</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.openflow.openflowj</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
-        <filtering>true</filtering>
-      </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>
-            </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, openflowjava-extension-nicira, openflowjava-extension-nicira-api,
-               openflowplugin-extension-nicira, of-extension.nx-ofjava, of-extension.nx-sal
-             </includeArtifactIds>
-             <includes>**\/*.xml</includes>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
deleted file mode 100644 (file)
index 022ff4c..0000000
--- a/distributions/base/src/assemble/bin.xml
+++ /dev/null
@@ -1,85 +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>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>opendaylight/plugins</outputDirectory>
-      <excludes>
-        <exclude>equinoxSDK381:org.eclipse.osgi</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.console</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.launcher</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.ds</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.util</exclude>
-        <exclude>equinoxSDK381:org.eclipse.osgi.services</exclude>
-        <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
-        <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
-        <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>ch.qos.logback:logback-core</exclude>
-        <exclude>ch.qos.logback:logback-classic</exclude>
-        <exclude>com.sun.jersey:jersey-core</exclude>
-        <exclude>com.sun.jersey:jersey-json</exclude>
-        <exclude>com.sun.jersey:jersey-server</exclude>
-        <exclude>org.opendaylight.defense4all:defense4all.core.impl</exclude>
-        <exclude>org.opendaylight.defense4all:framework.core.impl</exclude>
-        <exclude>org.opendaylight.defense4all:defense4all.restservice</exclude>
-      </excludes>
-      <outputFileNameMapping>
-        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-      </outputFileNameMapping>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/generated-resources</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-          <exclude>opendaylight/run.sh</exclude>
-          <exclude>opendaylight/run.bat</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>
-      <directory>${project.build.directory}/provided-configs/initial</directory>
-      <outputDirectory>/opendaylight/configuration/initial.available</outputDirectory>
-      <excludes>
-        <exclude>**/META-INF/**</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>${project.build.directory}/generated-resources/opendaylight/run.bat</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <destName>run.internal.bat</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.bat</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <fileMode>0755</fileMode>
-    </file>
-  </files>
-</assembly>

diff --git a/distributions/base/src/assemble/resources/run.bat b/distributions/base/src/assemble/resources/run.bat
deleted file mode 100644 (file)
index e3ddb19..0000000
--- a/distributions/base/src/assemble/resources/run.bat
+++ /dev/null
@@ -1,53 +0,0 @@
-@ECHO OFF\r
-SETLOCAL ENABLEDELAYEDEXPANSION\r
-\r
-SET CONTROLLER_RUNBAT=run.internal.bat\r
-SET OF_FILTER=\r
-SET OF13=0\r
-SET BUNDLEFILTER=\r
-\r
-:LOOP\r
-IF "%~1" NEQ "" (\r
-    SET CARG=%~1\r
-    IF "!CARG!"=="-of13" (\r
-       SET OF13=1\r
-       SHIFT\r
-       GOTO :LOOP\r
-    )\r
-\r
-    SET BUNDLEFILTER= !BUNDLEFILTER! !CARG!\r
-    SHIFT\r
-    GOTO :LOOP \r
-)\r
-\r
-dir /b configuration\initial>initial.txt\r
-dir /b configuration\initial.available>initial.available.txt\r
-\r
-REM clean available optional configurations\r
-for /f %%b in (initial.available.txt) do (\r
-      set foob=%%b\r
-            for /f %%a in (initial.txt) do (\r
-                set fooa=%%a\r
-                if !fooa!==!foob! (\r
-                     del configuration\initial\!foob!\r
-                ) \r
-            )\r
-)\r
-\r
-del initial.txt\r
-del initial.available.txt\r
-\r
-dir /b configuration\initial>initial.txt\r
-dir /b configuration\initial.available>initial.available.txt\r
-\r
-SET fifi="^^(?^!org.opendaylight.(openflowplugin^|openflowjava)).*"\r
-IF "%OF13%" NEQ "0" (\r
-\r
-copy configuration\initial.available\42-openflowplugin.xml configuration\initial\\r
-SET fifi="^^(?^!org.opendaylight.controller.(thirdparty.org.openflow^|protocol_plugins.openflow)).*"\r
-)\r
-\r
-del initial.txt\r
-del initial.available.txt\r
-\r
-%CONTROLLER_RUNBAT% "-Dfelix.fileinstall.filter=!fifi!" %BUNDLEFILTER%\r

diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh
deleted file mode 100755 (executable)
index 3404783..0000000
--- a/distributions/base/src/assemble/resources/run.sh
+++ /dev/null
@@ -1,81 +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=
-helparg=
-# Added help for of13 before help from controller (this help common for intagration and controller)
-function usage {
-    needParentHelp=true
-    if [ -n "${helparg}" ]; then
-       . functions.sh
-       harvestHelp ${helparg}
-       if (( $? == 0 )); then
-           needParentHelp=false
-           echo -e '\nFor more information type -help.\n'
-       fi
-    else
-        echo 'For more information on a specific command, type -help command-name.'
-        echo
-        echo '    Added option for integration:'
-        echo '    of13             [-of13]'
-        echo '    of10             [-of10]'
-        echo
-        echo '    Visit wiki for more information :'
-        echo
-        echo '    https://wiki.opendaylight.org/view/CrossProject:Integration_Group:Controller_Artifacts:run_sh'
-        echo
-        echo 'Common options: '
-    fi
-
-    if ${needParentHelp}; then
-        $CONTROLLER_RUNSH -help ${helparg}
-    fi
-    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 ${RUNSH_DIR}/configuration/initial -type l -exec rm {} \;
-
-##of13
-#of13             [-of13]
-#   Option to run the OpenDaylight controller with the OpenFlow plugin (1.3).
-##
-# OF Filter selection
-OF_FILTER="org.opendaylight.(openflowplugin|openflowjava|controller.sal-compatibility|ovsdb.of-extension)"
-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}) ${RUNSH_DIR}/configuration/initial/
-    done < <(find ${RUNSH_DIR}/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/distributions/pom.xml b/distributions/pom.xml
index 070cc98420b47810209a22b353286a2081416480..9b7b0902bb6f6f076666697cac4aa08a4c4589d5 100644 (file)
--- a/distributions/pom.xml
+++ b/distributions/pom.xml
@@ -14,9 +14,6 @@
   <name>OpenDaylight Distributions</name>
   <packaging>pom</packaging>
   <modules>
-    <module>base/</module>
-    <module>virtualization/</module>
-    <module>serviceprovider/</module>
     <module>extra/toaster</module>
     <module>extra/karaf</module>
   </modules>

diff --git a/distributions/serviceprovider/pom.xml b/distributions/serviceprovider/pom.xml
deleted file mode 100644 (file)
index 7aeda12..0000000
--- a/distributions/serviceprovider/pom.xml
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
-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.integration</groupId>
-    <artifactId>distributions</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <artifactId>distributions-serviceprovider</artifactId>
-  <packaging>pom</packaging>
-  <name>OpenDaylight Service Provider Edition</name>
-
-  <properties>
-    <bgpcep.version>0.4.0-SNAPSHOT</bgpcep.version>
-    <lispflowmapping.version>1.1.10</lispflowmapping.version>
-    <tcpmd5.version>1.1.0-SNAPSHOT</tcpmd5.version>
-
-    <ietf.topology.version>2013.10.21.7-SNAPSHOT</ietf.topology.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.integration</groupId>
-      <artifactId>distributions-base</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
-
-    <!--
-         BGPCEP: required IETF models
-         -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-ted</artifactId>
-      <version>${ietf.topology.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology</artifactId>
-      <version>${ietf.topology.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology-isis</artifactId>
-      <version>${ietf.topology.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-      <version>${ietf.topology.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology-ospf</artifactId>
-      <version>${ietf.topology.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: common artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>concepts</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>util</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: TCP-MD5 artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>tcpmd5-api</artifactId>
-      <version>${tcpmd5.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>tcpmd5-jni</artifactId>
-      <version>${tcpmd5.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>tcpmd5-netty</artifactId>
-      <version>${tcpmd5.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>tcpmd5-nio</artifactId>
-      <version>${tcpmd5.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.tcpmd5</groupId>
-      <artifactId>tcpmd5-controller-config</artifactId>
-      <version>${tcpmd5.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: topology artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>topology-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>topology-tunnel-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: BGP artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-concepts</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-linkstate</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-parser-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-parser-impl</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-parser-spi</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-rib-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-rib-impl</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-rib-spi</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-topology-provider</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-util</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-controller-config</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: Programming artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-impl</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-spi</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-topology-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-tunnel-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>programming-controller-config</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: Programming artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>rsvp-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!--
-         BGPCEP: PCEP artifacts
-         -->
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-ietf-stateful02</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-ietf-stateful07</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-impl</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-spi</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-testtool</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-topology-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-topology-provider</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-topology-spi</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-tunnel-api</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-tunnel-provider</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-controller-config</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-      <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>pcep-segment-routing</artifactId>
-      <version>${bgpcep.version}</version>
-    </dependency>
-
-    <!-- lispflowmapping -->
-       <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.yangmodel</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.api</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.config</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.implementation</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.clusterdao</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.northbound</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>mappingservice.southbound</artifactId>
-      <version>${lispflowmapping.version}</version>
-    </dependency>
-
-    <!--SNMP4SDN-->
-    <dependency>
-      <groupId>org.opendaylight.snmp4sdn</groupId>
-      <artifactId>snmp4sdn</artifactId>
-      <version>0.1.2</version>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-      </plugin>
-      <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>
-              <includeArtifacIds>distributions-base</includeArtifacIds>
-              <includeGroupIds>org.opendaylight.integration</includeGroupIds>
-              <excludeTransitive>true</excludeTransitive>
-              <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>unpack-provided-configs</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/provided-configs</outputDirectory>
-              <includeArtifactIds>
-                bgp-controller-config,
-                pcep-controller-config,
-                programming-controller-config,
-                tcpmd5-controller-config,
-              </includeArtifactIds>
-              <includeGroupIds>
-                org.opendaylight.bgpcep,
-                org.opendaylight.tcpmd5,
-              </includeGroupIds>
-              <excludeTransitive>true</excludeTransitive>
-              <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/distributions/serviceprovider/src/assemble/bin.xml b/distributions/serviceprovider/src/assemble/bin.xml
deleted file mode 100644 (file)
index ba0e9f3..0000000
--- a/distributions/serviceprovider/src/assemble/bin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<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>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}/provided-configs</directory>
-      <outputDirectory>/opendaylight/configuration</outputDirectory>
-      <excludes>
-        <exclude>**/META-INF/**</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>opendaylight/plugins</outputDirectory>
-      <excludes>
-        <exclude>equinoxSDK381:org.eclipse.osgi</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.console</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.launcher</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.ds</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.util</exclude>
-        <exclude>equinoxSDK381:org.eclipse.osgi.services</exclude>
-        <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
-        <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
-        <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>ch.qos.logback:logback-core</exclude>
-        <exclude>ch.qos.logback:logback-classic</exclude>
-        <exclude>com.sun.jersey:jersey-core</exclude>
-        <exclude>com.sun.jersey:jersey-json</exclude>
-        <exclude>com.sun.jersey:jersey-server</exclude>
-      </excludes>
-      <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/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
deleted file mode 100644 (file)
index b0d8c4f..0000000
--- a/distributions/virtualization/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--                                                                                                                                     
-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.integration</groupId>
-    <artifactId>distributions</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <artifactId>distributions-virtualization</artifactId>
-  <packaging>pom</packaging>
-  <name>Opendaylight Virtualization Edition</name>
-
-  <dependencies>
-
-    <!-- base distribution -->
-    
-    <dependency>
-      <groupId>org.opendaylight.integration</groupId>
-      <artifactId>distributions-base</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- ovsdb --> 
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt-providers</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- vtn -->
-
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>manager</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>manager.implementation</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>manager.neutron</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>manager.northbound</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>distribution.vtn-coordinator</artifactId>
-      <version>6.0.0.0-SNAPSHOT</version>
-      <type>tar.bz2</type>
-      <classifier>bin</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>distribution.vtn-coordinator</artifactId>
-      <version>6.0.0.0-SNAPSHOT</version>
-      <type>txt</type>
-      <classifier>README</classifier>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
-        <filtering>true</filtering>
-      </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>
-             <includeArtifacIds>distributions-base</includeArtifacIds>
-             <includeGroupIds>org.opendaylight.integration</includeGroupIds>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/distributions/virtualization/src/assemble/bin.xml b/distributions/virtualization/src/assemble/bin.xml
deleted file mode 100644 (file)
index eed9cf0..0000000
--- a/distributions/virtualization/src/assemble/bin.xml
+++ /dev/null
@@ -1,81 +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/run.sh</exclude>
-          <exclude>opendaylight/configuration/initial/03-toaster-sample.xml</exclude>
-          <exclude>opendaylight/plugins/org.opendaylight.controller.samples.sample-toaster-1.1-SNAPSHOT.jar</exclude>
-          <exclude>opendaylight/plugins/org.opendaylight.controller.samples.sample-toaster-provider-1.1-SNAPSHOT.jar</exclude>
-          <exclude>opendaylight/plugins/org.opendaylight.controller.samples.sample-toaster-consumer-1.1-SNAPSHOT.jar</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-  <files>
-    <file>
-      <source>${project.build.directory}/generated-resources/opendaylight/run.sh</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <destName>run.base.sh</destName>
-      <fileMode>0755</fileMode>
-    </file>
-    <file>
-      <source>${basedir}/src/assemble/resources/run.sh</source>
-      <outputDirectory>/opendaylight/</outputDirectory>
-      <fileMode>0755</fileMode>
-    </file>
-  </files>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>opendaylight/plugins</outputDirectory>
-      <excludes>
-        <exclude>equinoxSDK381:org.eclipse.osgi</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.console</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.launcher</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.ds</exclude>
-        <exclude>equinoxSDK381:org.eclipse.equinox.util</exclude>
-        <exclude>equinoxSDK381:org.eclipse.osgi.services</exclude>
-        <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
-        <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
-        <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
-        <exclude>org.slf4j:slf4j-api</exclude>
-        <exclude>ch.qos.logback:logback-core</exclude>
-        <exclude>ch.qos.logback:logback-classic</exclude>
-        <exclude>com.sun.jersey:jersey-core</exclude>
-        <exclude>com.sun.jersey:jersey-json</exclude>
-        <exclude>com.sun.jersey:jersey-server</exclude>
-        <exclude>org.opendaylight.defense4all:defense4all.core.impl</exclude>
-        <exclude>org.opendaylight.defense4all:framework.core.impl</exclude>
-        <exclude>org.opendaylight.defense4all:defense4all.restservice</exclude>
-        <exclude>org.opendaylight.vtn:distribution.vtn-coordinator</exclude>
-      </excludes>
-      <outputFileNameMapping>
-        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-      </outputFileNameMapping>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>opendaylight/externalapps</outputDirectory>
-      <includes>
-        <include>org.opendaylight.vtn:distribution.vtn-coordinator</include>
-      </includes>
-      <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/distributions/virtualization/src/assemble/resources/run.sh b/distributions/virtualization/src/assemble/resources/run.sh
deleted file mode 100755 (executable)
index d40f539..0000000
--- a/distributions/virtualization/src/assemble/resources/run.sh
+++ /dev/null
@@ -1,43 +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} [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"
-    elif [ "${virt}" == "opendove" ]; then
-        ODL_VIRT_FILTER="ovsdb|vtn"
-    elif [ "${virt}" == "vtn" ]; then
-        ODL_VIRT_FILTER="opendove|ovsdb.openstack|controller.(arphandler|samples)"
-    else
-        usage
-    fi
-fi
-
-$RUN_BASE_SH -bundlefilter "org.opendaylight.(${ODL_VIRT_FILTER})" "${@:1:$virtIndex-1}" "${@:virtIndex+2}"