Added a distribution directory that excludes old OF plugin and includes new one

Change-Id: Id65a7b146877335b884c00c4861bc63c3a9c10d2
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/distribution/base/pom.xml b/distribution/base/pom.xml
new file mode 100644 (file)
index 0000000..53610be
--- /dev/null
+++ b/distribution/base/pom.xml
@@ -0,0 +1,107 @@
+<!--
+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-commons</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../commons</relativePath>
+  </parent>
+
+  <artifactId>distributions-openflowplugin-base</artifactId>
+  <packaging>pom</packaging>
+  <name>Opendaylight OpenflowPlugin Base Edition </name>
+
+  <dependencies>
+
+    <!-- base distribution -->
+
+    <dependency>
+      <groupId>org.opendaylight.integration</groupId>
+      <artifactId>distributions-base</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+      <type>zip</type>
+      <classifier>osgipackage</classifier>
+      <!-- Make sure this isn't included on any classpath-->
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- openflowplugin -->
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin</artifactId>
+      <version>0.0.1-SNAPSHOT</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>
+  </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/distribution/base/src/assemble/bin.xml b/distribution/base/src/assemble/bin.xml
new file mode 100644 (file)
index 0000000..201b40f
--- /dev/null
+++ b/distribution/base/src/assemble/bin.xml
@@ -0,0 +1,51 @@
+<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>
+      </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>
+        <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/openflowplugin-parent/pom.xml b/openflowplugin-parent/pom.xml
index 227ed55873482dad8b293f7e6e6c41baeb9db90e..8e693eaf32b20c8fe60157ff6042a8e8dc2afcf7 100644 (file)
--- a/openflowplugin-parent/pom.xml
+++ b/openflowplugin-parent/pom.xml
@@ -11,6 +11,7 @@
       <module>../commons</module>
       <module>../openflow_netty</module>
       <module>../openflowplugin</module>
+      <module>../distribution/base</module>
       <module>../openflowplugin-it</module>
     </modules>
 </project>