From: Michal Rehak <mirehak@cisco.com>
Date: Tue, 7 Oct 2014 14:53:44 +0000 (+0200)
Subject: BUG-1680: default table-miss-entry feature
X-Git-Tag: release/lithium~747
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a7a6f373853d7bf6245ce80bbb73a49124e276b0;p=openflowplugin.git

BUG-1680: default table-miss-entry feature

- added table-miss-entry-enforcer to features in order to have
  it accessible in karaf

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

diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index dad06bdbae..b7e90cb940 100644
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -72,6 +72,29 @@
              <groupId>org.apache.felix</groupId>
              <artifactId>maven-bundle-plugin</artifactId>
          </plugin>
+         
+          <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-artifacts</id>
+              <goals>
+                <goal>attach-artifact</goal>
+              </goals>
+              <phase>package</phase>
+              <configuration>
+                <artifacts>
+                  <artifact>
+                    <file>${project.build.directory}/classes/initial/69-table-miss-enforcer.xml</file>
+                    <type>xml</type>
+                    <classifier>config</classifier>
+                  </artifact>
+                </artifacts>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
      </plugins>
     </build>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 179d94c27d..309281c2ee 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -71,6 +71,11 @@
       <artifactId>openflowplugin</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>table-miss-enforcer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>drop-test-karaf</artifactId>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 999d8a75db..9453cc7af0 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -45,4 +45,9 @@
         <bundle>mvn:org.opendaylight.openflowplugin/test-common/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/drop-test-karaf/${project.version}</bundle>
     </feature>
+    <feature name='odl-openflowplugin-apps' description="OpenDaylight :: Openflow Plugin :: Applications" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/table-miss-enforcer/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/69-table-miss-enforcer.xml">mvn:org.opendaylight.openflowplugin.applications/table-miss-enforcer/${project.version}/xml/config</configfile>
+    </feature>
 </features>