removed obsolete config yang and RuntimeGeneratedMappingService

Change-Id: I86c721ecce6132bd545778fe9a7380684c53c8f8
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml
index bef2943b4ce62942677efa8b1c3e2981eb91d16c..8159707d57dd4e7cf3010f1aa6678af62cc52a4c 100644 (file)
--- a/opendaylight/md-sal/sal-restconf-broker/pom.xml
+++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml
@@ -62,58 +62,12 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>

-                        <Bundle-Activator>org.opendaylight.controller.sal.restconf.broker.osgi.Activator</Bundle-Activator>

                         <Import-Package>
                                 *
                         </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
                         <Import-Package>
                                 *
                         </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>target/site/models</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.4-SNAPSHOT</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </plugin>

             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModule.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModule.java
deleted file mode 100644 (file)
index 7b7f089..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-data-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public final class DataBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractDataBrokerImplModule
- {
-
-    public DataBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DataBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            DataBrokerImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        //TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index 1722f6d..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/DataBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-data-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public class DataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractDataBrokerImplModuleFactory
-{
-
-
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModule.java
deleted file mode 100644 (file)
index ac42452..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-notification-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public final class NotificationBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractNotificationBrokerImplModule
- {
-
-    public NotificationBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NotificationBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            NotificationBrokerImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        //TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index bb05e06..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/NotificationBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-notification-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public class NotificationBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractNotificationBrokerImplModuleFactory
-{
-
-
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModule.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModule.java
deleted file mode 100644 (file)
index 3460ed0..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-rpc-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public final class RpcBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractRpcBrokerImplModule
- {
-
-    public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            RpcBrokerImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        //TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index 5d11f8d..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RpcBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-rpc-broker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public class RpcBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractRpcBrokerImplModuleFactory
-{
-
-
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModule.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModule.java
deleted file mode 100644 (file)
index 1b4a8f5..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-runtime-generated-mapping
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public final class RuntimeMappingModule extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractRuntimeMappingModule
- {
-
-    public RuntimeMappingModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public RuntimeMappingModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            RuntimeMappingModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        //TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModuleFactory.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModuleFactory.java
deleted file mode 100644 (file)
index 007b886..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/RuntimeMappingModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-runtime-generated-mapping
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public class RuntimeMappingModuleFactory extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractRuntimeMappingModuleFactory
-{
-
-
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModule.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModule.java
deleted file mode 100644 (file)
index 7022603..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-broker-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public final class SalRemoteServiceBrokerModule extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractSalRemoteServiceBrokerModule
- {
-
-    public SalRemoteServiceBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public SalRemoteServiceBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            SalRemoteServiceBrokerModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        //TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModuleFactory.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModuleFactory.java
deleted file mode 100644 (file)
index ed10cc0..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/restconf/broker/SalRemoteServiceBrokerModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-restconf-broker-impl  yang module local name: restconf-broker-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Feb 10 15:32:31 CET 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.restconf.broker;
-
-/**
-*
-*/
-public class SalRemoteServiceBrokerModuleFactory extends org.opendaylight.controller.config.yang.md.sal.restconf.broker.AbstractSalRemoteServiceBrokerModuleFactory
-{
-
-
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/osgi/Activator.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/osgi/Activator.java
deleted file mode 100644 (file)
index 13535ee..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/osgi/Activator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.sal.restconf.broker.osgi;
-
-import java.util.Hashtable;
-import javassist.ClassPool;
-import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl;
-import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class Activator implements BundleActivator {
-
-    private ServiceRegistration<BindingIndependentMappingService> mappingReg;
-
-    @Override
-    public void start(BundleContext context) throws Exception {
-        RuntimeGeneratedMappingServiceImpl service = new RuntimeGeneratedMappingServiceImpl();
-        service.setPool(new ClassPool());
-        service.init();
-        startRuntimeMappingService(service, context);
-    }
-
-    private void startRuntimeMappingService(RuntimeGeneratedMappingServiceImpl service, BundleContext context) {
-        Hashtable<String, String> properties = new Hashtable<String, String>();
-        mappingReg = context.registerService(BindingIndependentMappingService.class, service, properties);
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        if(mappingReg != null) {
-            mappingReg.unregister();
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/yang/opendaylight-restconf-broker-impl.yang b/opendaylight/md-sal/sal-restconf-broker/src/main/yang/opendaylight-restconf-broker-impl.yang
deleted file mode 100644 (file)
index 634a2ba..0000000
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/yang/opendaylight-restconf-broker-impl.yang
+++ /dev/null
@@ -1,142 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module opendaylight-sal-restconf-broker-impl {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:restconf:broker";
-    prefix "restconf-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding {prefix sal;}
-    import opendaylight-md-sal-dom {prefix dom;}
-    import opendaylight-md-sal-common {prefix common;}
-
-    description
-        "Service definition for Restconf MD-SAL.";
- 
-    revision "2014-02-10" {
-        description
-            "Initial revision";
-    }
-
-    identity binding-dom-mapping-service {
-        base config:service-type;
-        config:java-class "org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService";
-    }
-
-
-    identity restconf-broker-impl {
-        base config:module-type;
-        config:provided-service sal:binding-data-consumer-broker;
-        config:provided-service sal:binding-notification-subscription-service;
-        /*TODO provide RpcConsumerRegistry*/
-        config:java-name-prefix SalRemoteServiceBroker;
-    }
-    
-    identity restconf-data-broker {
-        base config:module-type;
-        config:provided-service sal:binding-data-broker;
-        config:java-name-prefix DataBrokerImpl;
-    }
-    
-    identity restconf-rpc-broker {
-        base config:module-type;
-        config:provided-service sal:binding-rpc-registry;
-        config:java-name-prefix RpcBrokerImpl;
-    }
-    
-    identity restconf-notification-broker {
-        base config:module-type;
-        config:provided-service sal:binding-notification-service;
-        config:java-name-prefix NotificationBrokerImpl;
-    }
-
-    identity restconf-runtime-generated-mapping {
-        base config:module-type;
-        config:provided-service binding-dom-mapping-service;
-        config:java-name-prefix RuntimeMapping;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case restconf-broker-impl {
-            when "/config:modules/config:module/config:type = 'restconf-broker-impl'";
-            
-            /*
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-rpc-registry;
-                    }
-                }
-            }*/
-            
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-data-broker;
-                    }
-                }
-            }
-            
-            container notification-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-notification-service;
-                    }
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case restconf-data-broker {
-            when "/config:modules/config:module/config:type = 'restconf-data-broker'";
-            container dom-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity dom:dom-broker-osgi-registry;
-                    }
-                }
-            }
-
-            container mapping-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-dom-mapping-service;
-                    }
-                }
-            } 
-        }
-    }
-    
-
-    augment "/config:modules/config:module/config:state" {
-        case restconf-runtime-generated-mapping {
-            when "/config:modules/config:module/config:type = 'restconf-runtime-generated-mapping'";
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case restconf-data-broker {
-            when "/config:modules/config:module/config:type = 'restconf-data-broker'";
-            container data {
-                uses common:data-state;
-            }
-        }
-    }
-    augment "/config:modules/config:module/config:state" {
-        case restconf-rpc-broker {
-            when "/config:modules/config:module/config:type = 'restconf-rpc-broker'";
-            uses common:rpc-state;
-        }
-    }
-    augment "/config:modules/config:module/config:state" {
-        case restconf-notification-broker {
-            when "/config:modules/config:module/config:type = 'restconf-notification-broker'";
-            uses common:notification-state;
-        }
-    }
-}
\ No newline at end of file