classifier for configuration files copies xml suffix

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a0db6726157e67a534dd061b44603a1fee492014..e346ed6470a4e47cd6905615a7f0a4d5d8fc3b1b 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -158,14 +158,14 @@
                 <artifactId>openflowplugin-controller-config</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>config</classifier>
+                <classifier>config-He</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>openflowplugin-controller-config</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>ofplugin-config</classifier>
+                <classifier>config-Li</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/features/pom.xml b/features/pom.xml
index 951897178fb7243c296bf627918b03cae261019d..dbb81b3652199bbe9617cd30bb370ee35f1d2438 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -192,13 +192,13 @@
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
       <type>xml</type>
-      <classifier>config</classifier>
+      <classifier>config-Li</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
       <type>xml</type>
-      <classifier>ofplugin-config</classifier>
+      <classifier>config-He</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 1c9d2d326c24d2469b966c58c014b4dc333b3805..bbfb4f7b0aaa2598f3fbc04ca1b5ed9b21cb45a0 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -25,7 +25,9 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
         <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>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config-He</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
     </feature>
 
@@ -43,7 +45,7 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
         <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-new.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/ofplugin-config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config-Li</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-flow-services' description="OpenDaylight :: Openflow Plugin :: Flow Services" version='${project.version}'>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index 81cc3bcad5daee63f568e7764ce655fba002dc85..b33f5035bb218ac0d411bc82f3acb87ddd666460 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -37,7 +37,7 @@
                                 <artifact>
                                     <file>${project.build.directory}/classes/initial/42-openflowplugin.xml</file>
                                     <type>xml</type>
-                                    <classifier>config</classifier>
+                                    <classifier>config-He</classifier>
                                 </artifact>
                             </artifacts>
                         </configuration>
@@ -53,7 +53,7 @@
                                 <artifact>
                                     <file>${project.build.directory}/classes/initial/42-openflowplugin-new.xml</file>
                                     <type>xml</type>
-                                    <classifier>ofplugin-config</classifier>
+                                    <classifier>config-Li</classifier>
                                 </artifact>
                             </artifacts>
                         </configuration>