Removal of obsolete distributions

 - distribution/base and distribution/cbench were based
   on controller's distribution/opendaylight which is already
   history.

Change-Id: Ia0df26094961d9b9f37268b56fea25ccbdac417e
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/distribution/base/pom.xml b/distribution/base/pom.xml
deleted file mode 100644 (file)
index e39c542..0000000
--- a/distribution/base/pom.xml
+++ /dev/null
@@ -1,206 +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.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <artifactId>distributions-openflowplugin-base</artifactId>
-  <packaging>pom</packaging>
-  <name>Opendaylight OpenflowPlugin Base Edition </name>
-
-  <dependencies>
-
-    <!-- base distribution -->
-
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>distribution.opendaylight</artifactId>
-      <version>${controller.distribution.version}</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- openflowplugin-api -->
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-api</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-
-    <!-- openflowplugin-extension-api -->
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-extension-api</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-
-    <!-- nicira extension -->
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-extension-nicira</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowjava-extension-nicira-api</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowjava-extension-nicira</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-
-    <!-- openflowplugin -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- initial config -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-controller-config</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- test-common -->
-    <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>test-common</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-
-    <!-- debug provider -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>test-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- extension test -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>test-extension</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-
-    <!-- drop-test provider -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>drop-test</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- openflowjava -->
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>util</artifactId>
-    </dependency>
-
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>table-miss-enforcer</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>lldp-speaker</artifactId>
-          <version>${project.version}</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, 
-             test-extension, openflowjava-extension-nicira, openflowjava-extension-nicira-api, openflowplugin-extension-nicira,
-             table-miss-enforcer,
-             </includeArtifactIds>
-             <includes>**\/*.xml</includes>
-             <excludes>META-INF</excludes>
-             <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/distribution/base/src/assemble/bin.xml b/distribution/base/src/assemble/bin.xml
deleted file mode 100644 (file)
index 3874508..0000000
--- a/distribution/base/src/assemble/bin.xml
+++ /dev/null
@@ -1,64 +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/org.opendaylight.controller.thirdparty.org.openflow.openflowj-*.jar</exclude>
-        <exclude>opendaylight/plugins/org.opendaylight.controller.protocol_plugins.openflow-*.jar</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>
-        src/main/resources/
-      </directory>
-      <excludes>
-        <exclude>version.properties</exclude>
-        <exclude>configuration/config.ini</exclude>
-      </excludes>
-      <outputDirectory>
-        opendaylight/
-      </outputDirectory>
-    </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>
-        <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>
-</assembly>

diff --git a/distribution/cbench/pom.xml b/distribution/cbench/pom.xml
deleted file mode 100644 (file)
index 6474afc..0000000
--- a/distribution/cbench/pom.xml
+++ /dev/null
@@ -1,84 +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.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-  <artifactId>distributions-openflowplugin-cbech</artifactId>
-  <packaging>pom</packaging>
-  <name>Opendaylight OpenflowPlugin CBENCH Edition </name>
-
-  <dependencies>
-
-    <!-- base distribution -->
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>distributions-openflowplugin-base</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- 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>
-        <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>
-             <includeGroupIds>org.opendaylight.openflowplugin</includeGroupIds>
-             <includeArtifactIds>distributions-openflowplugin-base</includeArtifactIds>
-             <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/distribution/cbench/src/assemble/bin.xml b/distribution/cbench/src/assemble/bin.xml
deleted file mode 100644 (file)
index 31bb6ca..0000000
--- a/distribution/cbench/src/assemble/bin.xml
+++ /dev/null
@@ -1,22 +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/org.opendaylight.controller.samples.simpleforwarding-*.jar</exclude>
-        <exclude>opendaylight/plugins/org.opendaylight.controller.arphandler-*.jar</exclude>
-        <exclude>opendaylight/plugins/org.opendaylight.controller.md.statistics-manager-*.jar</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-</assembly>

diff --git a/pom.xml b/pom.xml
index 2349ffd5075c4e0e9285e5a4c8846498940eddd5..10034e01283c869880a927a2d104b8f27d8327ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -637,8 +637,6 @@
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
       <module>extension</module>
-      <module>distribution/base</module>
-      <module>distribution/cbench</module>
       <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>
       <module>openflowplugin-it</module>