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

diff --git a/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
index 9f7c190853bbfd03ba7f86217fad9d531617ca2a..65859b89b5b5fb8466b41204ecdf7c71b95fb427 100644 (file)
--- a/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@ -60,7 +60,14 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <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 --git a/distributions/virtualization/src/assemble/bin.xml b/distributions/virtualization/src/assemble/bin.xml
index 542708bf14879ad42f5b05b231a4fc3f0f209a00..ecd1bd7f7a68bfd6f4b14475c0444c923fd35299 100644 (file)
--- a/distributions/virtualization/src/assemble/bin.xml
+++ b/distributions/virtualization/src/assemble/bin.xml
@@ -52,6 +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 +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>