Merge "Add filtering capability to config.ini in order to reference logging bridge...
authorTony Tkacik <ttkacik@cisco.com>
Tue, 8 Apr 2014 11:54:24 +0000 (11:54 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 8 Apr 2014 11:54:24 +0000 (11:54 +0000)
opendaylight/distribution/opendaylight/src/assemble/bin.xml
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini

index 6f8878b..0ff4c9a 100644 (file)
@@ -69,6 +69,7 @@
       </directory>
       <excludes>
         <exclude>version.properties</exclude>
+        <exclude>configuration/config.ini</exclude>
       </excludes>
       <outputDirectory>
         opendaylight/
       <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>
index e91a13b..9df653c 100644 (file)
@@ -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
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.