Fix logging.bridge file location in config.ini .

Change-Id: Ic2713ce4543df977dafd89caa5323eec574ce611
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/commons/distributions/bgpcep-controller/src/assemble/bin.xml b/commons/distributions/bgpcep-controller/src/assemble/bin.xml
index b23d91abf83ae40a3c8f66ab73c08eb692eaa205..7acca5e9dcb5b6e7b6d89822a0932dbf8b3bb911 100644 (file)
--- a/commons/distributions/bgpcep-controller/src/assemble/bin.xml
+++ b/commons/distributions/bgpcep-controller/src/assemble/bin.xml
@@ -70,6 +70,7 @@
             </directory>
             <excludes>
                 <exclude>version.properties</exclude>
+                <exclude>configuration/config.ini</exclude>
             </excludes>
             <outputDirectory>
                 opendaylight/
@@ -89,5 +90,10 @@
             <outputDirectory>opendaylight</outputDirectory>
             <filtered>true</filtered>
         </file>
+        <file>
+            <source>src/main/resources/configuration/config.ini</source>
+            <outputDirectory>opendaylight/configuration</outputDirectory>
+            <filtered>true</filtered>
+        </file>
     </files>
 </assembly>

diff --git a/commons/distributions/bgpcep-controller/src/main/resources/configuration/config.ini b/commons/distributions/bgpcep-controller/src/main/resources/configuration/config.ini
index 442aef6306a4619e2f4f17f92d236627808498d9..50445d7b1049710126348d728fb26f6d65156b27 100644 (file)
--- a/commons/distributions/bgpcep-controller/src/main/resources/configuration/config.ini
+++ b/commons/distributions/bgpcep-controller/src/main/resources/configuration/config.ini
@@ -8,7 +8,7 @@ osgi.bundles=\
     reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\
     reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\
     reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\
-    reference\:file\:../lib/logging.bridge-0.4.2@1:start,\
+    reference\:file\:../lib/logging.bridge-${controller.version}@1:start,\
     reference\:file\:../lib/jersey-core-1.17.jar@2:start,\
     reference\:file\:../lib/jersey-server-1.17.jar@2:start