Merge "BUG 1082 Migrate sal-rest-connector to Async Data Broker API"

diff --cc opendaylight/commons/opendaylight/pom.xml
Simple merge

diff --cc opendaylight/distribution/opendaylight/pom.xml
Simple merge

diff --cc opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
index 559be5aa6fe1358881d6df6f7f81a50409dfed49,bef1be2ed1d491ce5c9b7051d5489d7eff8ef96d..2fa99819d5f833a27c0de9d6fa02053e955b87ce
--- 1/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
--- 2/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProviderImpl.java
@@@ -37,15 -36,15 +36,15 @@@ public class RestconfProviderImpl imple
  
      @Override
      public void onSessionInitiated(ProviderSession session) {
-         DataBrokerService dataService = session.getService(DataBrokerService.class);
+         final DOMDataBroker domDataBroker = session.getService(DOMDataBroker.class);
  
          BrokerFacade.getInstance().setContext(session);
-         BrokerFacade.getInstance().setDataService(dataService);
+         BrokerFacade.getInstance().setDomDataBroker( domDataBroker);
  
          SchemaService schemaService = session.getService(SchemaService.class);
 -        listenerRegistration = schemaService.registerSchemaServiceListener(ControllerContext.getInstance());
 +        listenerRegistration = schemaService.registerSchemaContextListener(ControllerContext.getInstance());
          ControllerContext.getInstance().setSchemas(schemaService.getGlobalContext());
-         ControllerContext.getInstance().setMountService(session.getService(MountService.class));
+         ControllerContext.getInstance().setMountService(session.getService(DOMMountPointService.class));
  
          webSocketServerThread = new Thread(WebSocketServer.createInstance(port.getValue().intValue()));
          webSocketServerThread.setName("Web socket server on port " + port);

diff --cc opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
Simple merge

diff --cc opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/listeners/Notificator.java
Simple merge