Bug 1764 - added karaf settings for os-switch-config-pusher

Change-Id: I1d2739329ae346c58cb0d9370c01fe57fc926b08
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 025c49728ba44462ec47def4ac675061f0275643..b343d33c67a995ee886628e697f7ea933f7e6799 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -73,6 +73,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/70-of-switch-config-pusher.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 309281c2ee3652ae22c8bd1e85390661993c7116..0d9f95e782cfb94e73b7c493caf185d460ccf66c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -76,6 +76,11 @@
       <artifactId>table-miss-enforcer</artifactId>
       <version>${project.version}</version>
     </dependency>
+      <dependency>
+          <groupId>org.opendaylight.openflowplugin.applications</groupId>
+          <artifactId>of-switch-config-pusher</artifactId>
+          <version>${project.version}</version>
+      </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>drop-test-karaf</artifactId>
@@ -105,7 +110,7 @@
       <artifactId>liblldp</artifactId>
       <version>${sal.api.version}</version>
     </dependency>
-    
+
     <!-- test the features.xml -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 9453cc7af0f32fd1df1a9141a0c990dfbfe6138f..4856627735b7e87880819744c8afa3f39dd2fa50 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -15,6 +15,7 @@
         <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
         <feature version="${project.version}">odl-openflowplugin-flow-services-ui</feature>
     </feature>
+
     <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
         <feature version="${mdsal.version}">odl-flow-model</feature>
@@ -47,7 +48,13 @@
     </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>
+
+<!--
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/70-of-switch-config-pusher.xml">mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}/xml/config</configfile>
+-->
     </feature>
 </features>