Merge "Add VTN Coordinator tarball to the Virtualization Edition."

diff --combined distributions/virtualization/pom.xml
index 9f7c190853bbfd03ba7f86217fad9d531617ca2a,66c4dcfd4d57baac9b8216b5962ba73e9f688f78..65859b89b5b5fb8466b41204ecdf7c71b95fb427
--- 1/distributions/virtualization/pom.xml
--- 2/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@@ -35,8 -35,8 +35,8 @@@ http://maven.apache.org/maven-v4_0_0.xs
      <!-- ovsdb --> 
      <dependency>
        <groupId>org.opendaylight.ovsdb</groupId>
 -      <artifactId>ovsdb</artifactId>
 -      <version>0.4.0-SNAPSHOT</version>
 +      <artifactId>ovsdb.neutron</artifactId>
 +      <version>0.5.0-SNAPSHOT</version>
      </dependency>
  
      <!-- vtn -->
@@@ -60,7 -60,14 +60,14 @@@
        <groupId>org.opendaylight.vtn</groupId>
        <artifactId>manager.northbound</artifactId>
        <version>0.1.0-SNAPSHOT</version>
-     </dependency>    
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.vtn</groupId>
+       <artifactId>distribution.vtn-coordinator</artifactId>
+       <version>5.0.0.0-SNAPSHOT</version>
+       <type>tar.bz2</type>
+       <classifier>bin</classifier>
+     </dependency>
  
      <!-- defense4all -->
  

diff --combined distributions/virtualization/src/assemble/bin.xml
index 542708bf14879ad42f5b05b231a4fc3f0f209a00,9bf1c7b3bda05d73a80551e46083abb7a4245156..ecd1bd7f7a68bfd6f4b14475c0444c923fd35299
--- 1/distributions/virtualization/src/assemble/bin.xml
--- 2/distributions/virtualization/src/assemble/bin.xml
+++ b/distributions/virtualization/src/assemble/bin.xml
@@@ -12,24 -12,8 +12,24 @@@
      <fileSet>
        <directory>${project.build.directory}/generated-resources</directory>
        <outputDirectory>/</outputDirectory>
 +      <excludes>
 +          <exclude>opendaylight/run.sh</exclude>
 +      </excludes>
      </fileSet>
    </fileSets>
 +  <files>
 +    <file>
 +      <source>${project.build.directory}/generated-resources/opendaylight/run.sh</source>
 +      <outputDirectory>/opendaylight/</outputDirectory>
 +      <destName>run.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>
@@@ -52,6 -36,7 +52,7 @@@
          <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}
@@@ -60,5 -45,17 +61,17 @@@
        <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>