Bug 1999: fix msgspy

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

diff --git a/features/pom.xml b/features/pom.xml
index aca86e2a7f3e3936c6f7ed4b5dcc2c4ce7c2a181..d9e36e81ad9af98c0f9ca744ee9a61061521c891 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -81,6 +81,13 @@
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-controller-config</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>configmsgspy</classifier>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>liblldp</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index a4f6bb91381e08b7e295d7349b030e86687fbb01..dd17b33e87490561343c0a6f722897b2d6f4c0ea 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -23,6 +23,7 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
     </feature>
     <feature name='odl-openflowplugin-flow-services' description="OpenDaylight :: Openflow Plugin :: Flow Services" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index 22446a65c623718c5e5c17ea2d5436dc71f1cd36..93bbfa1a490b12d2df99a5d6afc3af5d6b5b1ea1 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -40,6 +40,22 @@
                 </artifacts>
               </configuration>
             </execution>
+            <execution>
+              <id>attach-artifacts-msgspy</id>
+              <goals>
+                <goal>attach-artifact</goal>
+              </goals>
+              <phase>package</phase>
+              <configuration>
+                <artifacts>
+                  <artifact>
+                    <file>${project.build.directory}/classes/initial/43-msg-spy.xml</file>
+                    <type>xml</type>
+                    <classifier>configmsgspy</classifier>
+                  </artifact>
+                </artifacts>
+              </configuration>
+            </execution>
           </executions>
         </plugin>
       </plugins>