Merge "Add filtering capability to config.ini in order to reference logging bridge...

diff --combined opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index e91a13b9f2dda31dc53860ea9c1563316d3f896b,b58e32a087477b41123b5938aacaa6b3ac479cc0..9df653cf94f00af395839711d6a347e2b1b04a0d
--- 1/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
--- 2/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@@ -8,7 -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
  
@@@ -26,20 -26,32 +26,20 @@@ netconf.ssh.pk.path = ./configuration/R
  
  netconf.config.persister.active=1,2
  # read startup configuration
 -#netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.DirectoryStorageAdapter
 -#netconf.config.persister.1.properties.directoryStorage=configuration/initial/
 -#netconf.config.persister.1.readonly=true
 -
 -netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.autodetect.AutodetectDirectoryStorageAdapter
 +netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter
  netconf.config.persister.1.properties.directoryStorage=configuration/initial/
 +# include only xml files, files with other extensions will be skipped, multiple extensions are permitted e.g. netconf.config.persister.1.properties.includeExtensions=xml,cfg,config
 +netconf.config.persister.1.properties.includeExtensions=xml
  netconf.config.persister.1.readonly=true
  
 -#netconf.config.persister.3.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter
 -#netconf.config.persister.3.properties.directoryStorage=configuration/initialXml/
 -#netconf.config.persister.3.readonly=true
 -
 -#netconf.config.persister.4.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter
 -#netconf.config.persister.4.properties.fileStorage=configuration/current/controller.currentconfig.txt
 -#netconf.config.persister.4.properties.numberOfBackups=1
 -
  netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter
  netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml
  netconf.config.persister.2.properties.numberOfBackups=1
  
 -yangstore.blacklist=.*controller.model.*
 -
  # Set Default start level for framework
  osgi.bundles.defaultStartLevel=4
  # Extra packages to import from the boot class loader
 -org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc
 +org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
  # This is not Eclipse App
  eclipse.ignoreApp=true
  # Don't shutdown equinox if the eclipse App has ended,