From e1658face07c354aa8fd5b12da700401ce1efc37 Mon Sep 17 00:00:00 2001
From: Tomas Olvecky <tolvecky@cisco.com>
Date: Thu, 13 Mar 2014 14:40:26 +0100
Subject: [PATCH] Add filtering capability to config.ini in order to reference
 logging bridge version.

Change-Id: I0c443eea8422953482270adad5ce6df3a16da97e
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
---
 opendaylight/distribution/opendaylight/src/assemble/bin.xml | 6 ++++++
 .../src/main/resources/configuration/config.ini             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 6f8878bee9..0ff4c9a83c 100644
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -69,6 +69,7 @@
       </directory>
       <excludes>
         <exclude>version.properties</exclude>
+        <exclude>configuration/config.ini</exclude>
       </excludes>
       <outputDirectory>
         opendaylight/
@@ -81,5 +82,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/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 7d45c82935..b58e32a087 100644
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/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-SNAPSHOT@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
 
-- 
2.36.6