Merge "removed config-util from pax-exam minimum bundles as this is not a bundle"

diff --combined opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 18c93ec6d9331ddc0b6fe5cccb4c4cd48b90747e,d60ad989627846d308dce74132877bd1ebdb6ccd..4ef9d80b02c2f34a34de5f7e6360857565bb71fe
--- 1/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
--- 2/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@@ -41,43 -41,42 +41,42 @@@ public class TestHelper 
                  mavenBundle("org.opendaylight.bgpcep", "framework").versionAsInProject(), //
                  mavenBundle("org.opendaylight.bgpcep", "util").versionAsInProject(), //
                  mavenBundle("commons-codec", "commons-codec").versionAsInProject(),
 -                
 +
                  mavenBundle(CONTROLLER, "config-api").versionAsInProject(), // //
                  mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // //
                  mavenBundle("commons-io", "commons-io").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "config-api").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), //
-                 mavenBundle(CONTROLLER, "config-util").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "yang-jmx-generator").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "yang-store-api").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "yang-store-impl").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "logback-config").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "config-persister-api").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "netconf-api").versionAsInProject(), //
 -               
 +
                  mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), //
                  mavenBundle(CONTROLLER + ".thirdparty", "ganymed", "1.0-SNAPSHOT"), //
                  mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), //
  
                  mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), //
 -                
 +
                  mavenBundle("io.netty", "netty-handler").versionAsInProject(), //
                  mavenBundle("io.netty", "netty-codec").versionAsInProject(), //
                  mavenBundle("io.netty", "netty-buffer").versionAsInProject(), //
                  mavenBundle("io.netty", "netty-transport").versionAsInProject(), //
                  mavenBundle("io.netty", "netty-common").versionAsInProject(), //
 -                
 +
                  mavenBundle("org.opendaylight.controller.thirdparty", "exificient", "0.9.2-SNAPSHOT"), //
 -                
 +
                  mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces", "2.11.0_1"),
                  mavenBundle("org.eclipse.birt.runtime.3_7_1", "org.apache.xml.resolver", "1.2.0"),
 -                
 +
                  mavenBundle(CONTROLLER, "config-netconf-connector").versionAsInProject(), //
                  mavenBundle(CONTROLLER, "netconf-impl").versionAsInProject(), //
 -                
 +
                  mavenBundle(CONTROLLER, "config-persister-file-adapter").versionAsInProject().noStart());
 -            
 +
      }
  
      public static Option bindingAwareSalBundles() {
@@@ -112,12 -111,10 +111,12 @@@
  
                  systemProperty("netconf.tcp.address").value("0.0.0.0"), //
                  systemProperty("netconf.tcp.port").value("18383"), //
 -                systemProperty("netconf.config.persister.storageAdapterClass").value(
 +                systemProperty("netconf.config.persister.active").value("1"), //
 +                systemProperty("netconf.config.persister.1.storageAdapterClass").value(
                          "org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter"), //
 -                systemProperty("fileStorage").value(PathUtils.getBaseDir() + "/src/test/resources/controller.config"), //
 -                systemProperty("numberOfBackups").value("1") //
 +                systemProperty("netconf.config.persister.1.properties.fileStorage")
 +                        .value(PathUtils.getBaseDir() + "/src/test/resources/controller.config"), //
 +                systemProperty("netconf.config.persister.1.properties.numberOfBackups").value("1") //
                  //systemProperty("yangstore.blacklist").value(".*controller.model.*") //
  
          );
@@@ -172,7 -169,7 +171,7 @@@
                   * org/mockito/cglib/proxy/Factory have different Class objects
                   * for the type org/mockito/cglib/ proxy/Callback used in the
                   * signature
 -                 * 
 +                 *
                   * So we disable the bootdelegation. this property has no effect
                   * on the other OSGi implementation.
                   */