From 149db3077b7582ed94963ca2bf897bd23d417446 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <tomas.slusny@pantheon.tech>
Date: Wed, 14 Jun 2017 16:13:04 +0200
Subject: [PATCH] Copy initial configuration file in Karaf 4

Fix copying of initial configuration file in Karaf 4. Problem was
that karaf .xml file that was supposed to handle this was incorrectly
located at `src/main/features/features.xml` but was supposed to be at
`src/main/feature/feature.xml` to work properly in Karaf 4.

Resolves: bug 8692

Change-Id: I9923a2b2598e05e95bb68a01cde5a8894679e534
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
---
 features/odl-openflowjava-protocol/pom.xml        | 15 ++++++++++++++-
 .../features.xml => feature/feature.xml}          |  0
 2 files changed, 14 insertions(+), 1 deletion(-)
 rename features/odl-openflowjava-protocol/src/main/{features/features.xml => feature/feature.xml} (100%)

diff --git a/features/odl-openflowjava-protocol/pom.xml b/features/odl-openflowjava-protocol/pom.xml
index 371d8552..5779f1c9 100644
--- a/features/odl-openflowjava-protocol/pom.xml
+++ b/features/odl-openflowjava-protocol/pom.xml
@@ -129,6 +129,17 @@
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>openflow-protocol-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-util</artifactId>
+        </dependency>
+        <!-- config files -->
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-config</artifactId>
+            <type>xml</type>
+            <classifier>configstats</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
             <artifactId>openflowjava-blueprint-config</artifactId>
@@ -137,7 +148,9 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
-            <artifactId>openflowjava-util</artifactId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <type>xml</type>
+            <classifier>legacyConfig</classifier>
         </dependency>
     </dependencies>
 
diff --git a/features/odl-openflowjava-protocol/src/main/features/features.xml b/features/odl-openflowjava-protocol/src/main/feature/feature.xml
similarity index 100%
rename from features/odl-openflowjava-protocol/src/main/features/features.xml
rename to features/odl-openflowjava-protocol/src/main/feature/feature.xml
-- 
2.36.6