Removing legacy distribution.

This removes the (legacy) distribution build from
the repo, as it is no longer used and/or needed.

Change-Id: Id1481e6c90b8eebbaef5022c4dac26be8614aa17
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644 (file)
index 0e2bccc..0000000
--- a/distribution/pom.xml
+++ /dev/null
@@ -1,148 +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.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <artifactId>distributions-groupbasedpolicy</artifactId>
-  <packaging>pom</packaging>
-  <name>Opendaylight Group-based Policy</name>
-
-  <properties>
-    <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
-    <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-  </properties>
-
-  <dependencies>
-
-    <!-- base distribution -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>distribution.opendaylight</artifactId>
-      <version>${controller.distribution.version}</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <scope>provided</scope>
-    </dependency> 
-
-    <!-- openflowplugin -->
-    <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</artifactId>
-      <version>${openflowplugin.version}</version>
-    </dependency>
-
-    <!-- openflowjava -->
-    <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-api</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.openflowjava</groupId>
-      <artifactId>util</artifactId>
-      <version>${openflowjava.version}</version>
-    </dependency>
-
-    <!-- groupbasedpolicy -->
-    <dependency>
-      <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy</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>
-        </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/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
deleted file mode 100644 (file)
index 3d855dc..0000000
--- a/distribution/src/assemble/bin.xml
+++ /dev/null
@@ -1,48 +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>
-        <exclude>opendaylight/plugins/org.opendaylight.controller.samples.*.jar</exclude>
-        <exclude>opendaylight/plugins/org.opendaylight.controller.md.statistics-manager*.jar</exclude>
-        <exclude>opendaylight/configuration/initial/*toaster*.xml</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>
-        src/main/resources/
-      </directory>
-      <excludes>
-        <exclude>version.properties</exclude>
-        <exclude>configuration/config.ini</exclude>
-        <exclude>*~</exclude>
-      </excludes>
-      <outputDirectory>
-        opendaylight/
-      </outputDirectory>
-    </fileSet>
-  </fileSets>
-  <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/src/main/resources/configuration/initial/15-groupbasedpolicy-ofoverlay.xml b/distribution/src/main/resources/configuration/initial/15-groupbasedpolicy-ofoverlay.xml
deleted file mode 100644 (file)
index 2b3a486..0000000
--- a/distribution/src/main/resources/configuration/initial/15-groupbasedpolicy-ofoverlay.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:ofoverlay="urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl">
-                        ofoverlay:ofoverlay-provider-impl
-                    </type>
-                    <name>ofoverlay-provider-impl</name>
-
-                    <rpc-registry>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                        <name>binding-rpc-broker</name>
-                    </rpc-registry>
-
-                   <data-broker>
-                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                      <name>binding-data-broker</name>
-                    </data-broker>
-                </module>
-           </modules>
-        </data>
-
-    </configuration>
-
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl?module=ofoverlay-provider-impl&amp;revision=2014-06-11</capability>
-    </required-capabilities>
-
-</snapshot>
-

diff --git a/distribution/src/main/resources/configuration/initial/42-openflowplugin.xml b/distribution/src/main/resources/configuration/initial/42-openflowplugin.xml
deleted file mode 100644 (file)
index bfb4af1..0000000
--- a/distribution/src/main/resources/configuration/initial/42-openflowplugin.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-    <!-- openflowjava -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28</capability>
-    <!-- openflowplugin -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl?module=openflow-provider-impl&amp;revision=2014-03-26</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config?module=openflow-provider&amp;revision=2014-03-26</capability>
-    <!-- binding-broker-impl - provided -->
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <!-- default OF-switch-connection-provider (port 6633) -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">prefix:openflow-switch-connection-provider-impl</type>
-          <name>openflow-switch-connection-provider-default-impl</name>
-          <port>6633</port>
-<!--      Possible transport-protocol options: TCP, TLS, UDP -->
-          <transport-protocol>TCP</transport-protocol>
-          <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy exemplary-switch-privkey.pem, exemplary-switch-cert.pem and exemplary-cacert.pem
-                  files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls> -->
-<!--           Exemplary thread model configuration. Uncomment <threads> tag below to adjust default thread model -->
-<!--           <threads>
-                 <boss-threads>2</boss-threads>
-                 <worker-threads>8</worker-threads>
-               </threads> -->
-        </module>
-        <!-- default OF-switch-connection-provider (port 6653) -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">prefix:openflow-switch-connection-provider-impl</type>
-          <name>openflow-switch-connection-provider-legacy-impl</name>
-          <port>6653</port>
-<!--      Possible transport-protocol options: TCP, TLS, UDP -->
-          <transport-protocol>TCP</transport-protocol>
-          <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy exemplary-switch-privkey.pem, exemplary-switch-cert.pem and exemplary-cacert.pem
-                  files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls> -->
-<!--           Exemplary thread model configuration. Uncomment <threads> tag below to adjust default thread model -->
-<!--           <threads>
-                 <boss-threads>2</boss-threads>
-                 <worker-threads>8</worker-threads>
-               </threads> -->
-        </module>
-
-
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl">prefix:openflow-provider-impl</type>
-          <name>openflow-provider-impl</name>
-          
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-default</name>
-          </openflow-switch-connection-provider>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-legacy</name>
-          </openflow-switch-connection-provider>
-
-
-          <binding-aware-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </binding-aware-broker>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">prefix:openflow-switch-connection-provider</type>
-          <instance>
-            <name>openflow-switch-connection-provider-default</name>
-            <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-default-impl']</provider>
-          </instance>
-          <instance>
-            <name>openflow-switch-connection-provider-legacy</name>
-            <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-legacy-impl']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:common:config">prefix:openflow-provider</type>
-          <instance>
-            <name>openflow-provider</name>
-            <provider>/modules/module[type='openflow-provider-impl'][name='openflow-provider-impl']</provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-
-  </configuration>
-</snapshot>

diff --git a/distribution/src/main/resources/configuration/initial/43-openflowjava-nx-api-config.xml b/distribution/src/main/resources/configuration/initial/43-openflowjava-nx-api-config.xml
deleted file mode 100644 (file)
index 1964e4d..0000000
--- a/distribution/src/main/resources/configuration/initial/43-openflowjava-nx-api-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config?module=openflowjava-nx-api-config&amp;revision=2014-07-11</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:openflowjava-extension-nicira-api</type>
-          <name>openflowjava-extension-nx-api-bundle</name>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-legacy</name>
-          </openflow-switch-connection-provider>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-default</name>
-          </openflow-switch-connection-provider>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:nicira-extension-codec-registrator</type>
-          <instance>
-            <name>openflowjava-nicira-ext-registrator</name>
-            <provider>/modules/module[type='openflowjava-extension-nicira-api'][name='openflowjava-extension-nx-api-bundle']</provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-
-  </configuration>
-</snapshot>

diff --git a/distribution/src/main/resources/configuration/initial/44-nicira-extension.xml b/distribution/src/main/resources/configuration/initial/44-nicira-extension.xml
deleted file mode 100644 (file)
index 8ab4fd9..0000000
--- a/distribution/src/main/resources/configuration/initial/44-nicira-extension.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-  <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:nx:config:impl?module=nicira-extension-impl&amp;revision=2014-07-11</capability>
-    <!-- openflowplugin -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config?module=openflow-provider&amp;revision=2014-03-26</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:nx:config:impl">prefix:nicira-extension-provider-impl</type>
-          <name>nicira-extension-provider-default-impl</name>
-          
-          <openflow-plugin-provider>
-            <type xmlns:opfprov="urn:opendaylight:params:xml:ns:yang:openflow:common:config">opfprov:openflow-provider</type>
-            <name>openflow-provider</name>
-          </openflow-plugin-provider>
-        </module>
-      </modules>
-    </data>
-
-  </configuration>
-</snapshot>

diff --git a/distribution/src/main/resources/configuration/initial/44-openflowjava-nx-config.xml b/distribution/src/main/resources/configuration/initial/44-openflowjava-nx-config.xml
deleted file mode 100644 (file)
index 756bd15..0000000
--- a/distribution/src/main/resources/configuration/initial/44-openflowjava-nx-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<snapshot>
-  <required-capabilities>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config?module=openflowjava-nx-config&amp;revision=2014-07-11</capability>
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:config">prefix:openflowjava-extension-nicira</type>
-          <name>openflow-nx-bundle</name>
-          <nicira-extension-codec-registrator>
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:ofjava:nx:api:config">prefix:nicira-extension-codec-registrator</type>
-            <name>openflowjava-nicira-ext-registrator</name>
-          </nicira-extension-codec-registrator>
-        </module>
-      </modules>
-    </data>
-
-  </configuration>
-</snapshot>