Remove CSS modules

The CSS features are still installed until we can work
out the ModuleInfoBackedContext/ClassLoaderStrategy situation
that is currently provided by the ConfigManagerActivator.

Change-Id: Id3b2cc287d17532482a2dd893c41e2dcd8d29ff0
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index bdfb932fef2e23c3ecc067b420fd0cfb9aef8723..c0bb29dd75f0e162af6ade8e60399fb271e37ace 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -23,11 +23,6 @@
 
     <name>OpenDaylight :: Config-Netty</name>
 
 
     <name>OpenDaylight :: Config-Netty</name>
 

-    <properties>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.netty.configfile>00-netty.xml</config.netty.configfile>
-    </properties>
-

     <dependencyManagement>
         <dependencies>
             <dependency>
     <dependencyManagement>
         <dependencies>
             <dependency>


@@ -42,8 +37,8 @@
 
     <dependencies>
         <dependency>
 
     <dependencies>
         <dependency>

-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-config-netty-config-api</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-netty-4</artifactId>

             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>


@@ -67,20 +62,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-config-startup</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <!-- finalname="${config.configfile.directory}/${config.netty.configfile}" -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>config-netty-config</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>

     </dependencies>
 
 </project>
     </dependencies>
 
 </project>

diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 84b3748..0000000
--- a/features/config-netty/odl-config-netty/src/main/feature/feature.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<features name="odl-config-persister-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-config-netty" version="${project.version}">
-        <configfile finalname="${config.configfile.directory}/${config.netty.configfile}">
-            mvn:org.opendaylight.controller/config-netty-config/${project.version}/xml/config
-        </configfile>
-    </feature>
-</features>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index c56df0c75db5c0c9874e0a47322521756af69261..92da77b5de174da620ec49fab2bfcde6214c32ac 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -25,8 +25,6 @@
 
     <properties>
         <blueprint.version>0.9.0-SNAPSHOT</blueprint.version>
 
     <properties>
         <blueprint.version>0.9.0-SNAPSHOT</blueprint.version>

-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.mdsal.configfile>01-md-sal.xml</config.mdsal.configfile>

     </properties>
 
     <dependencyManagement>
     </properties>
 
     <dependencyManagement>


@@ -59,13 +57,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>0.9.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>

             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>


@@ -98,12 +89,14 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-startup</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-startup</artifactId>

+            <version>0.9.0-SNAPSHOT</version>

             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>

+            <version>0.9.0-SNAPSHOT</version>

             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>


@@ -178,36 +171,16 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-connector-api</artifactId>
         </dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-connector-api</artifactId>
         </dependency>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-dom-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>

         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-inmemory-datastore</artifactId>
         </dependency>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-dom-broker-config</artifactId>
-        </dependency>

         <dependency>
             <!-- TODO start-level="40" -->
             <groupId>${project.groupId}</groupId>
             <artifactId>blueprint</artifactId>
             <version>0.9.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <!-- TODO start-level="40" -->
             <groupId>${project.groupId}</groupId>
             <artifactId>blueprint</artifactId>
             <version>0.9.0-SNAPSHOT</version>
         </dependency>

-        <dependency>
-            <!-- finalname="${config.configfile.directory}/${config.mdsal.configfile}" -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>md-sal-config</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>

     </dependencies>
 
 </project>
     </dependencies>
 
 </project>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 9301be6ee29a9b092ffa1b3b8a0005c0cf32d117..48dd0e7da577aae6ca08516c07ca87a835ed12a9 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -12,8 +12,5 @@
         <feature version="[2.0.3,3)">odl-yangtools-codec</feature>
         <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/${project.version}</bundle>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
         <feature version="[2.0.3,3)">odl-yangtools-codec</feature>
         <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/${project.version}</bundle>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>

-        <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}" override="true">
-            mvn:org.opendaylight.controller/md-sal-config/${project.version}/xml/config
-        </configfile>

     </feature>
 </features>
     </feature>
 </features>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index d9e3c2d135cd77e1213aa3599d2641db8eda1b61..feb13a329c571cdcc09379acc8a132053b11fcbb 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -21,11 +21,6 @@
     <version>1.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <version>1.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

-    <properties>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
-    </properties>
-

     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>


@@ -41,14 +36,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

-        <dependency>
-            <!-- finalname="${config.configfile.directory}/${config.clustering.configfile}" override="true" -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>

         <dependency>
             <!-- finalname="configuration/initial/akka.conf" -->
             <groupId>${project.groupId}</groupId>
         <dependency>
             <!-- finalname="configuration/initial/akka.conf" -->
             <groupId>${project.groupId}</groupId>

diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
index da9440f8aebbfbcd0d646eae26b993b1edb98cd4..8474cc9b669c9a83dc373fa75dfdbc5f21b3d734 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
@@ -8,9 +8,6 @@
  -->
 <features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-mdsal-broker" version="${project.version}">
  -->
 <features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-mdsal-broker" version="${project.version}">

-        <configfile finalname="${config.configfile.directory}/${config.clustering.configfile}" override="true">
-            mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/config
-        </configfile>

         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 3684d8162e35cfa32d2ea3b42f6b4fbab6b9ac73..ceebb5be78e76d78992b4a0177f1a057e1365198 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -24,13 +24,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>

       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>


@@ -67,10 +60,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-manager-facade-xml</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
index 08a8da0bb6d98575be91098e124ce85fe239a35f..4d7780147caab1dbdf68cf37131dbc9dbc7f2981 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java
@@ -22,7 +22,6 @@ import org.apache.aries.blueprint.services.BlueprintExtenderService;
 import org.apache.aries.quiesce.participant.QuiesceParticipant;
 import org.apache.aries.util.AriesFrameworkUtil;
 import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler;
 import org.apache.aries.quiesce.participant.QuiesceParticipant;
 import org.apache.aries.util.AriesFrameworkUtil;
 import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler;

-import org.opendaylight.controller.config.api.ConfigSystemService;

 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;


@@ -270,12 +269,6 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus
 
         restartService.close();
 
 
         restartService.close();
 

-        // Close all CSS modules first.
-        ConfigSystemService configSystem = getOSGiService(ConfigSystemService.class);
-        if (configSystem != null) {
-            configSystem.closeAllConfigModules();
-        }
-

         LOG.info("Shutting down all blueprint containers...");
 
         Collection<Bundle> containerBundles = new HashSet<>(Arrays.asList(bundleContext.getBundles()));
         LOG.info("Shutting down all blueprint containers...");
 
         Collection<Bundle> containerBundles = new HashSet<>(Arrays.asList(bundleContext.getBundles()));


@@ -371,28 +364,4 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus
         Bundle[] usingBundles = ref.getUsingBundles();
         return usingBundles != null ? usingBundles.length : 0;
     }
         Bundle[] usingBundles = ref.getUsingBundles();
         return usingBundles != null ? usingBundles.length : 0;
     }

-
-    private <T> T getOSGiService(final Class<T> serviceInterface) {
-        try {
-            ServiceReference<T> serviceReference = bundleContext.getServiceReference(serviceInterface);
-            if (serviceReference == null) {
-                LOG.warn("{} service reference not found", serviceInterface.getSimpleName());
-                return null;
-            }
-
-            T service = bundleContext.getService(serviceReference);
-            if (service == null) {
-                // This could happen on shutdown if the service was already unregistered so we log as debug.
-                LOG.debug("{} service instance was not found", serviceInterface.getSimpleName());
-            }
-
-            return service;
-        } catch (final IllegalStateException e) {
-            // This is thrown if the BundleContext is no longer valid which is possible on shutdown so we
-            // log as debug.
-            LOG.debug("Error obtaining OSGi service {}", serviceInterface.getSimpleName(), e);
-        }
-
-        return null;
-    }

 }
 }

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java
index 05a796843aeaa9f3a6f15c31011992a1c38ad930..2b2af15df979cabdbf1452ea40eb247a49684a07 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java
@@ -7,12 +7,9 @@
  */
 package org.opendaylight.controller.blueprint;
 
  */
 package org.opendaylight.controller.blueprint;
 

-import com.google.common.base.Optional;

 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;

-import java.lang.management.ManagementFactory;
-import java.util.AbstractMap.SimpleEntry;

 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;


@@ -21,34 +18,14 @@ import java.util.Deque;
 import java.util.Hashtable;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Hashtable;
 import java.util.LinkedHashSet;
 import java.util.List;

-import java.util.Map.Entry;

 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;

-import javax.annotation.Nullable;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import javax.xml.parsers.ParserConfigurationException;

 import org.apache.aries.blueprint.services.BlueprintExtenderService;
 import org.apache.aries.quiesce.participant.QuiesceParticipant;
 import org.apache.aries.util.AriesFrameworkUtil;
 import org.apache.aries.blueprint.services.BlueprintExtenderService;
 import org.apache.aries.quiesce.participant.QuiesceParticipant;
 import org.apache.aries.util.AriesFrameworkUtil;

-import org.opendaylight.controller.config.api.ConfigRegistry;
-import org.opendaylight.controller.config.api.ConflictingVersionException;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.facade.xml.ConfigExecution;
-import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade;
-import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacadeFactory;
-import org.opendaylight.controller.config.facade.xml.TestOption;
-import org.opendaylight.controller.config.facade.xml.mapping.config.Config;
-import org.opendaylight.controller.config.facade.xml.strategy.EditStrategyType;
-import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
-import org.opendaylight.controller.config.util.xml.DocumentedException;
-import org.opendaylight.controller.config.util.xml.XmlElement;
-import org.opendaylight.controller.config.util.xml.XmlMappingConstants;
-import org.opendaylight.controller.config.util.xml.XmlUtil;

 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;


@@ -57,8 +34,6 @@ import org.osgi.service.blueprint.container.BlueprintEvent;
 import org.osgi.service.blueprint.container.BlueprintListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.osgi.service.blueprint.container.BlueprintListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import org.w3c.dom.Document;
-import org.w3c.dom.Element;

 
 /**
  * Implementation of the BlueprintContainerRestartService.
 
 /**
  * Implementation of the BlueprintContainerRestartService.


@@ -68,9 +43,6 @@ import org.w3c.dom.Element;
 class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintContainerRestartService {
     private static final Logger LOG = LoggerFactory.getLogger(BlueprintContainerRestartServiceImpl.class);
     private static final int CONTAINER_CREATE_TIMEOUT_IN_MINUTES = 5;
 class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintContainerRestartService {
     private static final Logger LOG = LoggerFactory.getLogger(BlueprintContainerRestartServiceImpl.class);
     private static final int CONTAINER_CREATE_TIMEOUT_IN_MINUTES = 5;

-    private static final String CONFIG_MODULE_NAMESPACE_PROP = "config-module-namespace";
-    private static final String CONFIG_MODULE_NAME_PROP = "config-module-name";
-    private static final String CONFIG_INSTANCE_NAME_PROP = "config-instance-name";

 
     private final ExecutorService restartExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
             .setDaemon(true).setNameFormat("BlueprintContainerRestartService").build());
 
     private final ExecutorService restartExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
             .setDaemon(true).setNameFormat("BlueprintContainerRestartService").build());


@@ -117,8 +89,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo
 
         // We use a LinkedHashSet to preserve insertion order as we walk the service usage hierarchy.
         Set<Bundle> containerBundlesSet = new LinkedHashSet<>();
 
         // We use a LinkedHashSet to preserve insertion order as we walk the service usage hierarchy.
         Set<Bundle> containerBundlesSet = new LinkedHashSet<>();

-        List<Entry<String, ModuleIdentifier>> configModules = new ArrayList<>();
-        findDependentContainersRecursively(forBundle, containerBundlesSet, configModules);
+        findDependentContainersRecursively(forBundle, containerBundlesSet);

 
         List<Bundle> containerBundles = new ArrayList<>(containerBundlesSet);
 
 
         List<Bundle> containerBundles = new ArrayList<>(containerBundlesSet);
 


@@ -165,9 +136,6 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo
 
         AriesFrameworkUtil.safeUnregisterService(eventHandlerReg);
 
 
         AriesFrameworkUtil.safeUnregisterService(eventHandlerReg);
 

-        // Now restart any associated config system Modules.
-        restartConfigModules(forBundle.getBundleContext(), configModules);
-

         LOG.info("Finished restarting blueprint containers for bundle {} and its dependent bundles", forBundle);
     }
 
         LOG.info("Finished restarting blueprint containers for bundle {} and its dependent bundles", forBundle);
     }
 


@@ -227,90 +195,14 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo
         });
     }
 
         });
     }
 

-    private void restartConfigModules(final BundleContext bundleContext, final List<Entry<String,
-            ModuleIdentifier>> configModules) {
-        if (configModules.isEmpty()) {
-            return;
-        }
-
-        ServiceReference<ConfigSubsystemFacadeFactory> configFacadeFactoryRef = bundleContext
-                .getServiceReference(ConfigSubsystemFacadeFactory.class);
-        if (configFacadeFactoryRef == null) {
-            LOG.debug("ConfigSubsystemFacadeFactory service reference not found");
-            return;
-        }
-
-        ConfigSubsystemFacadeFactory configFacadeFactory = bundleContext.getService(configFacadeFactoryRef);
-        if (configFacadeFactory == null) {
-            LOG.debug("ConfigSubsystemFacadeFactory service not found");
-            return;
-        }
-
-        try (ConfigSubsystemFacade configFacade = configFacadeFactory.createFacade(
-                "BlueprintContainerRestartService")) {
-            restartConfigModules(configModules, configFacade);
-        } catch (ParserConfigurationException | DocumentedException | ValidationException
-                | ConflictingVersionException e) {
-            LOG.error("Error restarting config modules", e);
-        } finally {
-            bundleContext.ungetService(configFacadeFactoryRef);
-        }
-
-    }
-
-    private void restartConfigModules(final List<Entry<String, ModuleIdentifier>> configModules,
-            final ConfigSubsystemFacade configFacade) throws ParserConfigurationException, DocumentedException,
-                    ValidationException, ConflictingVersionException {
-
-        Document document = XmlUtil.newDocument();
-        Element dataElement = XmlUtil.createElement(document, XmlMappingConstants.DATA_KEY, Optional.<String>absent());
-        Element modulesElement = XmlUtil.createElement(document, XmlMappingConstants.MODULES_KEY,
-                Optional.of(XmlMappingConstants.URN_OPENDAYLIGHT_PARAMS_XML_NS_YANG_CONTROLLER_CONFIG));
-        dataElement.appendChild(modulesElement);
-
-        Config configMapping = configFacade.getConfigMapping();
-
-        ConfigRegistry configRegistryClient = new ConfigRegistryJMXClient(ManagementFactory.getPlatformMBeanServer());
-        for (Entry<String, ModuleIdentifier> entry : configModules) {
-            String moduleNamespace = entry.getKey();
-            ModuleIdentifier moduleId = entry.getValue();
-            try {
-                ObjectName instanceON = configRegistryClient.lookupConfigBean(moduleId.getFactoryName(),
-                        moduleId.getInstanceName());
-
-                LOG.debug("Found config module instance ObjectName: {}", instanceON);
-
-                Element moduleElement = configMapping.moduleToXml(moduleNamespace, moduleId.getFactoryName(),
-                        moduleId.getInstanceName(), instanceON, document);
-                modulesElement.appendChild(moduleElement);
-            } catch (final InstanceNotFoundException e) {
-                LOG.warn("Error looking up config module: namespace {}, module name {}, instance {}",
-                        moduleNamespace, moduleId.getFactoryName(), moduleId.getInstanceName(), e);
-            }
-        }
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Pushing config xml: {}", XmlUtil.toString(dataElement));
-        }
-
-        ConfigExecution execution = new ConfigExecution(configMapping, XmlElement.fromDomElement(dataElement),
-                TestOption.testThenSet, EditStrategyType.recreate);
-        configFacade.executeConfigExecution(execution);
-        configFacade.commitSilentTransaction();
-    }
-

     /**
      * Recursively finds the services registered by the given bundle and the bundles using those services.
     /**
      * Recursively finds the services registered by the given bundle and the bundles using those services.

-     * User bundles that have an associated blueprint container are added to containerBundles. In addition,
-     * if a registered service has an associated config system Module, as determined via the presence of
-     * certain service properties, the ModuleIdentifier is added to the configModules list.
+     * User bundles that have an associated blueprint container are added to containerBundles.

      *
      * @param bundle the bundle to traverse
      * @param containerBundles the current set of bundles containing blueprint containers
      *
      * @param bundle the bundle to traverse
      * @param containerBundles the current set of bundles containing blueprint containers

-     * @param configModules the current set of bundles containing config modules

      */
      */

-    private void findDependentContainersRecursively(final Bundle bundle, final Set<Bundle> containerBundles,
-            final List<Entry<String, ModuleIdentifier>> configModules) {
+    private void findDependentContainersRecursively(final Bundle bundle, final Set<Bundle> containerBundles) {

         if (!containerBundles.add(bundle)) {
             // Already seen this bundle...
             return;
         if (!containerBundles.add(bundle)) {
             // Already seen this bundle...
             return;


@@ -319,13 +211,11 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo
         ServiceReference<?>[] references = bundle.getRegisteredServices();
         if (references != null) {
             for (ServiceReference<?> reference : references) {
         ServiceReference<?>[] references = bundle.getRegisteredServices();
         if (references != null) {
             for (ServiceReference<?> reference : references) {

-                possiblyAddConfigModuleIdentifier(reference, configModules);
-

                 Bundle[] usingBundles = reference.getUsingBundles();
                 if (usingBundles != null) {
                     for (Bundle usingBundle : usingBundles) {
                         if (blueprintExtenderService.getContainer(usingBundle) != null) {
                 Bundle[] usingBundles = reference.getUsingBundles();
                 if (usingBundles != null) {
                     for (Bundle usingBundle : usingBundles) {
                         if (blueprintExtenderService.getContainer(usingBundle) != null) {

-                            findDependentContainersRecursively(usingBundle, containerBundles, configModules);
+                            findDependentContainersRecursively(usingBundle, containerBundles);

                         }
                     }
                 }
                         }
                     }
                 }


@@ -333,42 +223,6 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo
         }
     }
 
         }
     }
 

-    private void possiblyAddConfigModuleIdentifier(final ServiceReference<?> reference,
-            final List<Entry<String, ModuleIdentifier>> configModules) {
-        Object moduleNamespace = reference.getProperty(CONFIG_MODULE_NAMESPACE_PROP);
-        if (moduleNamespace == null) {
-            return;
-        }
-
-        String moduleName = getRequiredConfigModuleProperty(CONFIG_MODULE_NAME_PROP, moduleNamespace,
-                reference);
-        String instanceName = getRequiredConfigModuleProperty(CONFIG_INSTANCE_NAME_PROP, moduleNamespace,
-                reference);
-        if (moduleName == null || instanceName == null) {
-            return;
-        }
-
-        LOG.debug("Found service with config module: namespace {}, module name {}, instance {}",
-                moduleNamespace, moduleName, instanceName);
-
-        configModules.add(new SimpleEntry<>(moduleNamespace.toString(),
-                new ModuleIdentifier(moduleName, instanceName)));
-    }
-
-    @Nullable
-    private String getRequiredConfigModuleProperty(final String propName, final Object moduleNamespace,
-            final ServiceReference<?> reference) {
-        Object value = reference.getProperty(propName);
-        if (value == null) {
-            LOG.warn(
-                "OSGi service with {} property is missing property {} therefore the config module can't be restarted",
-                CONFIG_MODULE_NAMESPACE_PROP, propName);
-            return null;
-        }
-
-        return value.toString();
-    }
-

     private ServiceRegistration<?> registerEventHandler(final BundleContext bundleContext,
             final BlueprintListener listener) {
         return bundleContext.registerService(BlueprintListener.class.getName(), listener, new Hashtable<>());
     private ServiceRegistration<?> registerEventHandler(final BundleContext bundleContext,
             final BlueprintListener listener) {
         return bundleContext.registerService(BlueprintListener.class.getName(), listener, new Hashtable<>());

diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml
index af981aed03b296d2fc31ec7fc935b1bc949259e3..4096ec932a74629d08b6813d9af7d20ac5cfe404 100644 (file)
--- a/opendaylight/config/config-parent/pom.xml
+++ b/opendaylight/config/config-parent/pom.xml
@@ -71,10 +71,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>

   </dependencies>
   <build>
     <pluginManagement>
   </dependencies>
   <build>
     <pluginManagement>

diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml
deleted file mode 100644 (file)
index be756ad..0000000
--- a/opendaylight/md-sal/md-sal-config/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2014 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
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.controller</groupId>
-  <artifactId>md-sal-config</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <description>Configuration files for md-sal</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-        <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/01-md-sal.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml
deleted file mode 100644 (file)
index 1464f8b..0000000
--- a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- 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
-
- NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for backwards
-       compatibility. Runtime modifications may not be honored.
--->
-<snapshot>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:schema-service-singleton</type>
-                    <name>yang-schema-service</name>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:runtime-generated-mapping</type>
-                    <name>runtime-mapping-singleton</name>
-                    <wait-for-schema xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">true</wait-for-schema>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-notification-adapter</type>
-                    <name>binding-notification-adapter</name>
-                    <binding-notification-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                            <name>dom-broker</name>
-                        </dom-async-broker>
-                    </binding-notification-adapter>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-notification-publish-adapter</type>
-                    <name>binding-notification-publish-adapter</name>
-                    <binding-notification-publish-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                            <name>dom-broker</name>
-                        </dom-async-broker>
-                    </binding-notification-publish-adapter>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-notification-broker</type>
-                    <name>binding-notification-broker</name>
-                    <notification-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-new-notification-service</type>
-                         <name>binding-notification-adapter</name>
-                    </notification-adapter>
-                    <notification-publish-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                         <type  xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-new-notification-publish-service</type>
-                         <name>binding-notification-publish-adapter</name>
-                    </notification-publish-adapter>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-broker-impl</type>
-                    <name>binding-broker-impl</name>
-                    <binding-broker-impl xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                            <name>dom-broker</name>
-                        </dom-async-broker>
-                        <notification-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                            <name>binding-notification-broker</name>
-                        </notification-service>
-                        <root-data-broker>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                            <name>binding-data-broker</name>
-                        </root-data-broker>
-                        <notification-publish-service>
-                            <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-new-notification-publish-service</type>
-                            <name>binding-notification-publish-adapter</name>
-                        </notification-publish-service>
-                    </binding-broker-impl>
-                </module>
-
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">prefix:inmemory-config-datastore-provider</type>
-                    <name>config-store-service</name>
-                    <inmemory-config-datastore-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                    </inmemory-config-datastore-provider>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">prefix:inmemory-operational-datastore-provider</type>
-                    <name>operational-store-service</name>
-                    <inmemory-operational-datastore-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider">
-                        <schema-service>
-                             <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                             <name>yang-schema-service</name>
-                        </schema-service>
-                    </inmemory-operational-datastore-provider>
-                </module>
-
-                <!-- PingPong broker -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:pingpong">prefix:pingpong-data-broker</type>
-                    <name>pingpong-data-broker</name>
-                    <data-broker>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                        <name>inmemory-data-broker</name>
-                    </data-broker>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-                    <name>pingpong-binding-data-broker</name>
-                    <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                            <name>pingpong-broker</name>
-                        </dom-async-broker>
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                    </binding-forwarded-data-broker>
-                </module>
-
-                <!--
-                     Tree-based in-memory data store. This is the data store which is currently
-                     recommended for single-node deployments.
-                -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-inmemory-data-broker</type>
-                    <name>inmemory-data-broker</name>
-
-                    <schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                        <name>yang-schema-service</name>
-                    </schema-service>
-
-                   <config-data-store>
-                        <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                        <name>config-store-service</name>
-                    </config-data-store>
-
-                    <operational-data-store>
-                        <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                        <name>operational-store-service</name>
-                    </operational-data-store>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-broker-impl</type>
-                    <name>inmemory-dom-broker</name>
-                    <async-data-broker>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                        <name>inmemory-data-broker</name>
-                    </async-data-broker>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-forwarded-data-broker</type>
-                    <name>binding-async-data-broker</name>
-                    <binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-                        <dom-async-broker>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                            <name>inmemory-data-broker</name>
-                        </dom-async-broker>
-                        <schema-service>
-                            <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                            <name>yang-schema-service</name>
-                        </schema-service>
-                        <binding-mapping-service>
-                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-                            <name>runtime-mapping-singleton</name>
-                        </binding-mapping-service>
-                    </binding-forwarded-data-broker>
-                </module>
-            </modules>
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                    <instance>
-                        <name>yang-schema-service</name>
-                        <provider>/modules/module[type='schema-service-singleton'][name='yang-schema-service']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:yang-text-source-provider</type>
-                    <instance>
-                        <name>yang-text-source-provider</name>
-                        <provider>/modules/module[type='schema-service-singleton'][name='yang-schema-service']</provider>
-                    </instance>
-                </service>
-
-                <service>
-                    <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                    <instance>
-                        <name>config-store-service</name>
-                        <provider>/modules/module[type='inmemory-config-datastore-provider'][name='config-store-service']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                    <instance>
-                        <name>operational-store-service</name>
-                        <provider>/modules/module[type='inmemory-operational-datastore-provider'][name='operational-store-service']</provider>
-                    </instance>
-                </service>
-                    <service>
-                        <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-dom-mapping-service</type>
-                        <instance>
-                            <name>runtime-mapping-singleton</name>
-                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-codec-tree-factory</type>
-                        <instance>
-                            <name>runtime-mapping-singleton</name>
-                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-normalized-node-serializer</type>
-                        <instance>
-                            <name>runtime-mapping-singleton</name>
-                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec">binding:binding-v1-codec-tree-factory</type>
-                        <instance>
-                            <name>runtime-mapping-singleton</name>
-                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec">binding:binding-v1-normalized-node-serializer</type>
-                        <instance>
-                            <name>runtime-mapping-singleton</name>
-                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-new-notification-service</type>
-                        <instance>
-                            <name>binding-notification-adapter</name>
-                            <provider>/modules/module[type='binding-notification-adapter'][name='binding-notification-adapter']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-new-notification-publish-service</type>
-                        <instance>
-                            <name>binding-notification-publish-adapter</name>
-                            <provider>/modules/module[type='binding-notification-publish-adapter'][name='binding-notification-publish-adapter']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                        <instance>
-                            <name>binding-notification-broker</name>
-                            <provider>/modules/module[type='binding-notification-broker'][name='binding-notification-broker']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-                        <instance>
-                            <name>binding-osgi-broker</name>
-                            <provider>/modules/module[type='binding-broker-impl'][name='binding-broker-impl']</provider>
-                        </instance>
-                    </service>
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                        <instance>
-                            <name>binding-rpc-broker</name>
-                            <provider>/modules/module[type='binding-broker-impl'][name='binding-broker-impl']</provider>
-                        </instance>
-                    </service>
-
-                    <service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                        <instance>
-                            <name>dom-broker</name>
-                            <provider>/modules/module[type='dom-broker-impl'][name='inmemory-dom-broker']</provider>
-                        </instance>
-                    </service>
-
-                    <service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <instance>
-                            <name>binding-data-broker</name>
-                            <provider>/modules/module[type='binding-forwarded-data-broker'][name='binding-async-data-broker']</provider>
-                        </instance>
-                        <instance>
-                            <name>pingpong-binding-data-broker</name>
-                            <provider>/modules/module[type='binding-forwarded-data-broker'][name='pingpong-binding-data-broker']</provider>
-                        </instance>
-                    </service>
-
-                    <service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                        <instance>
-                            <name>inmemory-data-broker</name>
-                            <provider>/modules/module[type='dom-inmemory-data-broker'][name='inmemory-data-broker']</provider>
-                        </instance>
-                        <instance>
-                            <name>pingpong-broker</name>
-                            <provider>/modules/module[type='pingpong-data-broker'][name='pingpong-data-broker']</provider>
-                        </instance>
-                    </service>
-
-            </services>
-        </data>
-    </configuration>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&amp;revision=2013-11-12</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:pingpong?module=opendaylight-pingpong-broker&amp;revision=2014-11-07</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store?module=opendaylight-config-dom-datastore&amp;revision=2014-06-17</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store?module=opendaylight-operational-dom-datastore&amp;revision=2014-06-17</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider?module=opendaylight-inmemory-datastore-provider&amp;revision=2014-06-17</capability>
-
-    </required-capabilities>
-</snapshot>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 44901d694a4f38e22adb4d013ad2c53dfda01552..4827669e5310c251e750052808d8fc5d637effac 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -86,26 +86,6 @@
                 <artifactId>sal-inmemory-datastore</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>sal-inmemory-datastore</artifactId>
                 <version>${project.version}</version>
             </dependency>

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-broker-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-binding-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>md-sal-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-schema-service</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-schema-service</artifactId>

diff --git a/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java b/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java
index d553fde041ef944a1f1dbfea5294d09b65904caa..a5fc65130b17b5ac5c1504e106d0c0b05574ef14 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java
+++ b/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java
@@ -20,9 +20,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRunti
 import java.io.File;
 import javax.inject.Inject;
 import org.junit.Before;
 import java.io.File;
 import javax.inject.Inject;
 import org.junit.Before;

-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;

 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.OptionUtils;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.OptionUtils;


@@ -34,7 +31,7 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-public abstract class AbstractMdsalTestBase implements BindingAwareProvider {
+public abstract class AbstractMdsalTestBase {

 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractMdsalTestBase.class);
     private static final String MAVEN_REPO_LOCAL = "maven.repo.local";
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractMdsalTestBase.class);
     private static final String MAVEN_REPO_LOCAL = "maven.repo.local";


@@ -46,7 +43,6 @@ public abstract class AbstractMdsalTestBase implements BindingAwareProvider {
     private static final String KARAF_DEBUG_PORT = "5005";
     private static final String KARAF_DEBUG_PROP = "karaf.debug";
     private static final String KEEP_UNPACK_DIRECTORY_PROP = "karaf.keep.unpack";
     private static final String KARAF_DEBUG_PORT = "5005";
     private static final String KARAF_DEBUG_PROP = "karaf.debug";
     private static final String KEEP_UNPACK_DIRECTORY_PROP = "karaf.keep.unpack";

-    private static final int REGISTRATION_TIMEOUT = 70000;

 
     /*
      * Default values for karaf distro type, groupId, and artifactId
 
     /*
      * Default values for karaf distro type, groupId, and artifactId


@@ -59,7 +55,6 @@ public abstract class AbstractMdsalTestBase implements BindingAwareProvider {
      * Property names to override defaults for karaf distro artifactId, groupId,
      * version, and type
      */
      * Property names to override defaults for karaf distro artifactId, groupId,
      * version, and type
      */

-    private static final String KARAF_DISTRO_VERSION_PROP = "karaf.distro.version";

     private static final String KARAF_DISTRO_TYPE_PROP = "karaf.distro.type";
     private static final String KARAF_DISTRO_ARTIFACTID_PROP = "karaf.distro.artifactId";
     private static final String KARAF_DISTRO_GROUPID_PROP = "karaf.distro.groupId";
     private static final String KARAF_DISTRO_TYPE_PROP = "karaf.distro.type";
     private static final String KARAF_DISTRO_ARTIFACTID_PROP = "karaf.distro.artifactId";
     private static final String KARAF_DISTRO_GROUPID_PROP = "karaf.distro.groupId";


@@ -68,40 +63,13 @@ public abstract class AbstractMdsalTestBase implements BindingAwareProvider {
 
     @Inject @Filter(timeout = 60000)
     private BundleContext context;
 
     @Inject @Filter(timeout = 60000)
     private BundleContext context;

-    @Inject @Filter(timeout = 60000)
-    private BindingAwareBroker broker;
-    private ProviderContext session = null;
-
-    public ProviderContext getSession() {
-        return session;
-    }

 
     public abstract MavenUrlReference getFeatureRepo();
 
     public abstract String getFeatureName();
 
 
     public abstract MavenUrlReference getFeatureRepo();
 
     public abstract String getFeatureName();
 

-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("Session Initiated: {}",session);
-        this.session = session;
-    }
-

     @Before
     public void setup() throws Exception {
     @Before
     public void setup() throws Exception {

-        long start = System.nanoTime();
-        broker.registerProvider(this);
-        for (int i = 0; i < REGISTRATION_TIMEOUT; i++) {
-            if (session != null) {
-                long stop = System.nanoTime();
-                LOG.info("Registered session {} with the MD-SAL after {} ns",
-                        session,
-                        stop - start);
-                return;
-            } else {
-                Thread.sleep(1);
-            }
-        }
-        throw new RuntimeException("Session not initiated after " + REGISTRATION_TIMEOUT + " ms");

     }
 
     public Option getLoggingOption() {
     }
 
     public Option getLoggingOption() {

diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml
index bae2ad723d857a9531643ccdea262128aa3f8c84..d1573e498a35eb9c6b0988ec2ff3aa4db2b29c0c 100644 (file)
--- a/opendaylight/md-sal/messagebus-impl/pom.xml
+++ b/opendaylight/md-sal/messagebus-impl/pom.xml
@@ -29,10 +29,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>

-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index ae3f5bb7b167ff7c163d828a5dbd4a3fbcc5a139..abf36a3cd954046e0739998985f602e3fe10cb97 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -20,10 +20,6 @@
   <version>1.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <version>1.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

-  <properties>
-    <jmxGeneratorPath>${project.build.directory}/generated-sources/config-binding</jmxGeneratorPath>
-  </properties>
-

   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>


@@ -33,13 +29,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>

     </dependencies>
   </dependencyManagement>
 
     </dependencies>
   </dependencyManagement>
 


@@ -48,65 +37,19 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
     </dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
     </dependency>

+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>

+      <version>0.9.0-SNAPSHOT</version>

     </dependency>
   </dependencies>
 
   <build>
     <plugins>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>

-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-        <version>2.0.5</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>config</id>
-            <goals>
-              <goal>generate-sources</goal>
-            </goals>
-            <configuration>
-              <codeGenerators>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                  <additionalConfiguration>
-                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                  </additionalConfiguration>
-                </generator>
-              </codeGenerators>
-              <inspectDependencies>true</inspectDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${jmxGeneratorPath}</directory>
-                <includes>
-                  <include>**</include>
-                </includes>
-              </fileset>
-              <fileset>
-                <directory>${salGeneratorPath}</directory>
-                <includes>
-                  <include>**</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>

       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index dd404d945c0026cb9da4ded7d5f60ced402a694b..054ba2cd711152e85a9c90183030c1eed9623cd4 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -36,14 +36,6 @@
 
     <module>sal-binding-util</module>
 
 
     <module>sal-binding-util</module>
 

-    <!-- Config subsystem bindings -->
-    <module>sal-dom-config</module>
-    <module>sal-dom-broker-config</module>
-    <module>sal-binding-config</module>
-
-    <!-- Configuration File -->
-    <module>md-sal-config</module>
-

     <!-- Samples -->
     <module>samples</module>
 
     <!-- Samples -->
     <module>samples</module>
 

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
index 950384eb8e5ab2d51911faea74d4fabd4547c128..95204ceabf82e686491be4acbc21c776dbe2374f 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
@@ -34,6 +34,7 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+@Deprecated

 public class RootBindingAwareBroker implements Mutable, Identifiable<String>, BindingAwareBroker, AutoCloseable,
         RpcProviderRegistry {
 
 public class RootBindingAwareBroker implements Mutable, Identifiable<String>, BindingAwareBroker, AutoCloseable,
         RpcProviderRegistry {
 

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
index 55d589428dfef1e04dc0d2b5e73133c16cdf777d..2595420c846a4cb5856ae8cb598a40df7047db01 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
@@ -26,13 +26,7 @@
     </interfaces>
   </service>
 
     </interfaces>
   </service>
 

-  <service id="codec" ref="mappingCodec" interface="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec">
-    <service-properties>
-      <entry key="config-module-namespace" value="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl"/>
-      <entry key="config-module-name" value="runtime-generated-mapping"/>
-      <entry key="config-instance-name" value="runtime-mapping-singleton"/>
-    </service-properties>
-  </service>
+  <service id="codec" ref="mappingCodec" interface="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec"/>

 
   <!-- Binding RPC Registry Service -->
 
 
   <!-- Binding RPC Registry Service -->
 


@@ -135,4 +129,17 @@
   <service ref="bindingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
           odl:type="pingpong"/>
 
   <service ref="bindingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
           odl:type="pingpong"/>
 

+  <!-- Legacy BindingAwareBroker -->
+
+  <bean id="bindingAwareBroker" class="org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker"
+      init-method="start" destroy-method="close">
+    <argument value="deprecated-BindingAwareBroker"/>
+    <property name="dataBroker" ref="bindingDataBroker"/>
+    <property name="mountService" ref="bindingMountPointService"/>
+    <property name="rpcBroker" ref="bindingRpcRegistry"/>
+    <property name="notificationBroker" ref="bindingNotificationProviderService"/>
+    <property name="notificationPublishService" ref="bindingNotificationPublishAdapter"/>
+  </bean>
+
+  <service ref="bindingAwareBroker" interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>

 </blueprint>
 </blueprint>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
deleted file mode 100644 (file)
index 13bf461..0000000
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>sal-binding-config</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <!-- The Java classes are mostly config yang-generated wjich we don't want analyzed by findbugs.
-          However the generated package names don't conform to the findbugs exclusion filter
-          hence we explicitly skip findbugs. -->
-    <findbugs.skip>true</findbugs.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-dom-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Export-Package>
-                            {local-packages},
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.binding.impl.rev131028.*,
-                            org.opendaylight.controller.config.yang.md.sal.binding.impl
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
-</project>

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java
deleted file mode 100644 (file)
index 92b8d0c..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingAsyncDataBrokerImplModule extends AbstractBindingAsyncDataBrokerImplModule {
-
-    public BindingAsyncDataBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public BindingAsyncDataBrokerImplModule(
-            final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final BindingAsyncDataBrokerImplModule oldModule,
-            final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final BindingToNormalizedNodeCodec mappingService = getBindingMappingServiceDependency();
-        final DOMDataBroker domDataBroker = getDomAsyncBrokerDependency();
-        return new BindingDOMDataBrokerAdapter(domDataBroker, mappingService);
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index 5956d78..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingAsyncDataBrokerImplModuleFactory extends AbstractBindingAsyncDataBrokerImplModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java
deleted file mode 100644 (file)
index f9a64ab..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2014 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
- */
-/**
- * Generated file
-
- * Generated from: yang module name: opendaylight-sal-binding-broker-impl  yang module local name: binding-broker-impl
- * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
- * Generated at: Wed Nov 20 17:33:01 CET 2013
- *
- * Do not modify this file unless it is present under src/main directory
- */
-package org.opendaylight.controller.config.yang.md.sal.binding.impl;
-
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
-import org.opendaylight.controller.sal.core.api.Broker;
-import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class BindingBrokerImplModule extends
-        org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModule {
-
-    public BindingBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public BindingBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final BindingBrokerImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-    }
-
-    @Override
-    public RootBindingAwareBroker createInstance() {
-        final Broker domBroker = getDomAsyncBrokerDependency();
-        final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency();
-        final ProviderSession session = domBroker.registerProvider(new DummyDOMProvider());
-
-        final MountPointService mount = createMountPointAdapter(codec,session);
-        final BindingDOMRpcServiceAdapter rpcConsumer = createRpcConsumer(codec,session);
-        final BindingDOMRpcProviderServiceAdapter rpcProvider = createRpcProvider(codec,session);
-        final RootBindingAwareBroker broker = new RootBindingAwareBroker(getIdentifier().getInstanceName());
-        final RpcProviderRegistry heliumRpcBroker = new HeliumRpcProviderRegistry(rpcConsumer, rpcProvider);
-
-        broker.setNotificationBroker(getNotificationServiceDependency());
-        if (getNotificationPublishServiceDependency() != null) {
-            broker.setNotificationPublishService(getNotificationPublishServiceDependency());
-        }
-        broker.setRpcBroker(heliumRpcBroker);
-        broker.setDataBroker(getRootDataBrokerDependency());
-        broker.setMountService(mount);
-        broker.start();
-        return broker;
-    }
-
-    private BindingDOMRpcProviderServiceAdapter createRpcProvider(final BindingToNormalizedNodeCodec codec,
-            final ProviderSession session) {
-        final DOMRpcProviderService domService = session.getService(DOMRpcProviderService.class);
-        if (domService != null) {
-            return new BindingDOMRpcProviderServiceAdapter(domService, codec);
-        }
-        return null;
-    }
-
-    private BindingDOMRpcServiceAdapter createRpcConsumer(final BindingToNormalizedNodeCodec codec,
-            final ProviderSession session) {
-        final DOMRpcService domService = session.getService(DOMRpcService.class);
-        if (domService != null) {
-            return new BindingDOMRpcServiceAdapter(domService, codec);
-        }
-        return null;
-    }
-
-    private MountPointService createMountPointAdapter(final BindingToNormalizedNodeCodec codec,
-            final ProviderSession session) {
-        final DOMMountPointService domService = session.getService(DOMMountPointService.class);
-        if (domService != null) {
-            return new BindingDOMMountPointServiceAdapter(domService, codec);
-        }
-        return null;
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index e655373..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014 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
- */
-/**
-* Generated file
-
-* Generated from: yang module name: opendaylight-sal-binding-broker-impl  yang module local name: binding-broker-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 20 17:33:01 CET 2013
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.md.sal.binding.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingBrokerImplModuleFactory extends AbstractBindingBrokerImplModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java
deleted file mode 100644 (file)
index a076163..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.sal.core.api.Broker;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingNotificationAdapterModule extends AbstractBindingNotificationAdapterModule  {
-    public BindingNotificationAdapterModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public BindingNotificationAdapterModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final BindingNotificationAdapterModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency();
-        final Broker.ProviderSession session = getDomAsyncBrokerDependency().registerProvider(new DummyDOMProvider());
-        final DOMNotificationService notifService = session.getService(DOMNotificationService.class);
-        return new BindingDOMNotificationServiceAdapter(codec.getCodecRegistry(), notifService);
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java
deleted file mode 100644 (file)
index 1a28e80..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingNotificationAdapterModuleFactory extends AbstractBindingNotificationAdapterModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java
deleted file mode 100644 (file)
index e394d66..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.controller.sal.core.api.Broker;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingNotificationPublishAdapterModule extends AbstractBindingNotificationPublishAdapterModule {
-    public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final BindingNotificationPublishAdapterModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency();
-        final Broker.ProviderSession session = getDomAsyncBrokerDependency().registerProvider(new DummyDOMProvider());
-        final DOMNotificationPublishService publishService = session.getService(DOMNotificationPublishService.class);
-        return new BindingDOMNotificationPublishServiceAdapter(codec, publishService);
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java
deleted file mode 100644 (file)
index 59fec8c..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class BindingNotificationPublishAdapterModuleFactory
-        extends AbstractBindingNotificationPublishAdapterModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyDOMProvider.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyDOMProvider.java
deleted file mode 100644 (file)
index ca3054e..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyDOMProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015 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.config.yang.md.sal.binding.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
-import org.opendaylight.controller.sal.core.api.Provider;
-
-class DummyDOMProvider implements Provider {
-
-    @Override
-    @Deprecated
-    public Collection<ProviderFunctionality> getProviderFunctionality() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void onSessionInitiated(ProviderSession session) {
-        // NOOP
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java
deleted file mode 100644 (file)
index 6016c4a..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.binding.impl;
-
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceWithInterestListeners;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class NotificationBrokerImplModule extends
-        org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModule {
-
-    public NotificationBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NotificationBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final NotificationBrokerImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return createHeliumAdapter(getNotificationPublishAdapterDependency(), getNotificationAdapterDependency());
-    }
-
-    private static AutoCloseable createHeliumAdapter(final NotificationPublishService publishService,
-            final NotificationService listenService) {
-        if (listenService instanceof BindingDOMNotificationServiceAdapter
-                && publishService instanceof BindingDOMNotificationPublishServiceAdapter) {
-            final BindingDOMNotificationPublishServiceAdapter castedPublish =
-                    (BindingDOMNotificationPublishServiceAdapter) publishService;
-            final BindingDOMNotificationServiceAdapter castedListen =
-                    (BindingDOMNotificationServiceAdapter) listenService;
-            final DOMNotificationPublishService domPublishService = castedPublish.getDomPublishService();
-            if (domPublishService instanceof DOMNotificationSubscriptionListenerRegistry) {
-                final DOMNotificationSubscriptionListenerRegistry subsRegistry =
-                        (DOMNotificationSubscriptionListenerRegistry) domPublishService;
-                return new HeliumNotificationProviderServiceWithInterestListeners(castedPublish, castedListen,
-                        subsRegistry);
-            }
-        }
-        return new HeliumNotificationProviderServiceAdapter(publishService, listenService);
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index 856916e..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.binding.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class NotificationBrokerImplModuleFactory extends AbstractNotificationBrokerImplModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
deleted file mode 100644 (file)
index ba26463..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.binding.impl;
-
-import com.google.common.base.Preconditions;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.osgi.framework.BundleContext;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class RuntimeMappingModule extends AbstractRuntimeMappingModule {
-    private BundleContext bundleContext;
-
-    public RuntimeMappingModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public RuntimeMappingModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final RuntimeMappingModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-        Preconditions.checkNotNull(bundleContext);
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public boolean canReuseInstance(final AbstractRuntimeMappingModule oldModule) {
-        return true;
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // We need to return the concrete BindingToNormalizedNodeCodec instance for backwards compatibility
-        // for CSS users that inject the binding-dom-mapping-service.
-        final WaitingServiceTracker<BindingToNormalizedNodeCodec> tracker =
-                WaitingServiceTracker.create(BindingToNormalizedNodeCodec.class, bundleContext);
-        final BindingToNormalizedNodeCodec service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        // Ideally we would close the ServiceTracker via the returned AutoCloseable but then we'd have to
-        // proxy the BindingToNormalizedNodeCodec instance which is problematic. It's OK to close the
-        // ServiceTracker here.
-        tracker.close();
-        return service;
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java
deleted file mode 100644 (file)
index 8eaf9d4..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.binding.impl;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class RuntimeMappingModuleFactory extends
-        org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModuleFactory {
-
-    public static final String SINGLETON_NAME = "runtime-mapping-singleton";
-
-    @Override
-    public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            RuntimeMappingModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) {
-        checkArgument(SINGLETON_NAME.equals(instanceName),
-                "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME);
-        RuntimeMappingModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance,
-                bundleContext);
-        // FIXME bundle context should not be passed around
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        checkArgument(SINGLETON_NAME.equals(instanceName),
-                "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME);
-        RuntimeMappingModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext);
-        // FIXME bundle context should not be passed around
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang
deleted file mode 100644 (file)
index a40acc8..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang
+++ /dev/null
@@ -1,263 +0,0 @@
-module opendaylight-sal-binding-broker-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl";
-    prefix "binding-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding {prefix sal;}
-    import opendaylight-md-sal-binding-v1-codec {prefix v1codec;}
-    import opendaylight-md-sal-dom {prefix dom;}
-    import opendaylight-md-sal-common {prefix common;}
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
-
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity binding-dom-mapping-service {
-        base config:service-type;
-        config:java-class "org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec";
-        config:disable-osgi-service-registration;
-    }
-
-    /* FIXME: move to opendaylight-md-sal-binding (cannot be there due to Class name confict with old implementation)*/
-    identity binding-new-notification-service {
-        status deprecated;
-        base config:service-type;
-        config:java-class "org.opendaylight.controller.md.sal.binding.api.NotificationService";
-        config:disable-osgi-service-registration;
-    }
-
-    /* TODO: move to opendaylight-md-sal-binding (cannot be there due to Class name confict with old implementation)*/
-    identity binding-new-notification-publish-service {
-        status deprecated;
-        base config:service-type;
-        config:java-class "org.opendaylight.controller.md.sal.binding.api.NotificationPublishService";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-broker-impl {
-        status deprecated;
-        base config:module-type;
-        config:provided-service sal:binding-broker-osgi-registry;
-        config:provided-service sal:binding-rpc-registry;
-        config:java-name-prefix BindingBrokerImpl;
-    }
-
-    identity binding-forwarded-data-broker {
-        status deprecated;
-        base config:module-type;
-        config:provided-service sal:binding-async-data-broker;
-        config:java-name-prefix BindingAsyncDataBrokerImpl;
-    }
-
-    identity binding-notification-broker {
-        status deprecated;
-        base config:module-type;
-        config:provided-service sal:binding-notification-service;
-        config:provided-service sal:binding-notification-subscription-service;
-        config:java-name-prefix NotificationBrokerImpl;
-    }
-
-    identity runtime-generated-mapping {
-        status deprecated;
-        base config:module-type;
-        config:provided-service binding-dom-mapping-service;
-        config:provided-service sal:binding-codec-tree-factory;
-        config:provided-service sal:binding-normalized-node-serializer;
-        config:provided-service v1codec:binding-v1-codec-tree-factory;
-        config:provided-service v1codec:binding-v1-normalized-node-serializer;
-        config:java-name-prefix RuntimeMapping;
-    }
-
-    identity binding-notification-adapter {
-        status deprecated;
-        base config:module-type;
-        config:provided-service binding-new-notification-service;
-        config:java-name-prefix BindingNotificationAdapter;
-    }
-
-    identity binding-notification-publish-adapter {
-        status deprecated;
-        base config:module-type;
-        config:provided-service binding-new-notification-publish-service;
-        config:java-name-prefix BindingNotificationPublishAdapter;
-    }
-
-    grouping dom-forwarding-component {
-        status deprecated;
-        container dom-async-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity dom:dom-broker-osgi-registry;
-                    }
-                }
-            }
-
-        container binding-mapping-service {
-            uses config:service-ref {
-                refine type {
-                    mandatory true;
-                    config:required-identity binding-dom-mapping-service;
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-broker-impl {
-            when "/config:modules/config:module/config:type = 'binding-broker-impl'";
-
-            /*
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-rpc-registry;
-                    }
-                }
-            }*/
-            container binding-broker-impl {
-                uses dom-forwarding-component;
-
-                container notification-service {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:binding-notification-service;
-                        }
-                    }
-                }
-
-                container root-data-broker {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:binding-async-data-broker;
-                        }
-                    }
-                }
-
-                container notification-publish-service {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity binding-new-notification-publish-service;
-                        }
-                        refine name {
-                            mandatory false;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-forwarded-data-broker {
-            when "/config:modules/config:module/config:type = 'binding-forwarded-data-broker'";
-            container binding-forwarded-data-broker {
-                container dom-async-broker {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory true;
-                            config:required-identity dom:dom-async-data-broker;
-                        }
-                    }
-                }
-
-                container binding-mapping-service {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory true;
-                            config:required-identity binding-dom-mapping-service;
-                        }
-                    }
-                }
-
-                container schema-service {
-                    status deprecated;
-                    uses config:service-ref {
-                        refine type {
-                            mandatory true;
-                            config:required-identity dom:schema-service;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    augment "/config:modules/config:module/config:configuration" {
-        case runtime-generated-mapping {
-            when "/config:modules/config:module/config:type = 'runtime-generated-mapping'";
-            leaf wait-for-schema {
-                status deprecated;
-                default "false";
-                type boolean;
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-notification-broker {
-            when "/config:modules/config:module/config:type = 'binding-notification-broker'";
-            container notification-adapter {
-                status deprecated;
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-new-notification-service;
-                    }
-                }
-            }
-
-            container notification-publish-adapter {
-                status deprecated;
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-new-notification-publish-service;
-                    }
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case binding-notification-broker {
-            when "/config:modules/config:module/config:type = 'binding-notification-broker'";
-            uses common:notification-state;
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-notification-adapter {
-            when "/config:modules/config:module/config:type = 'binding-notification-adapter'";
-            container binding-notification-adapter {
-                status deprecated;
-                uses dom-forwarding-component;
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-notification-publish-adapter {
-            when "/config:modules/config:module/config:type = 'binding-notification-publish-adapter'";
-            container binding-notification-publish-adapter {
-                status deprecated;
-                uses dom-forwarding-component;
-            }
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang
deleted file mode 100644 (file)
index c10af1c..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang
+++ /dev/null
@@ -1,27 +0,0 @@
-module opendaylight-md-sal-binding-v1-codec {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec";
-    prefix "md-sal-binding";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
-
-    revision "2016-07-14" {
-        description
-            "Initial revision";
-    }
-    identity binding-v1-codec-tree-factory {
-        base "config:service-type";
-        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-v1-normalized-node-serializer {
-        base "config:service-type";
-        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer";
-        config:disable-osgi-service-registration;
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang
deleted file mode 100644 (file)
index f52aa34..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang
+++ /dev/null
@@ -1,57 +0,0 @@
-module opendaylight-md-sal-binding {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding";
-    prefix "md-sal-binding";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
-
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity binding-broker-osgi-registry {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.binding.api.BindingAwareBroker";
-    }
-
-    identity binding-async-data-broker {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.md.sal.binding.api.DataBroker";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-rpc-registry {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.binding.api.RpcProviderRegistry";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-notification-service {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.binding.api.NotificationProviderService";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-codec-tree-factory {
-        base "config:service-type";
-        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-normalized-node-serializer {
-        base "config:service-type";
-        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer";
-        config:disable-osgi-service-registration;
-    }
-
-    identity binding-notification-subscription-service {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.binding.api.NotificationService";
-        config:disable-osgi-service-registration;
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/yang/actor-system-provider-service.yang b/opendaylight/md-sal/sal-clustering-commons/src/main/yang/actor-system-provider-service.yang
deleted file mode 100644 (file)
index 4f97c3a..0000000
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/yang/actor-system-provider-service.yang
+++ /dev/null
@@ -1,19 +0,0 @@
-module actor-system-provider-service {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service";
-    prefix "actor-system";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description "Akka actor system provider service definition";
-
-    revision "2015-10-05" {
-        description "Initial revision";
-    }
-
-    identity actor-system-provider-service {
-        base "config:service-type";
-        config:java-class  "org.opendaylight.controller.cluster.ActorSystemProvider";
-        config:disable-osgi-service-registration;
-    }
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index 1ba41e73699731c6beae2d87ac29be9d85ff17a6..ec78665e357056784e2b9fb39dc4d535790c88fa 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -36,11 +36,6 @@
           <phase>package</phase>
           <configuration>
             <artifacts>
           <phase>package</phase>
           <configuration>
             <artifacts>

-              <artifact>
-                <file>${project.build.directory}/classes/initial/05-clustering.xml.conf</file>
-                <type>xml</type>
-                <classifier>config</classifier>
-              </artifact>

               <artifact>
                 <file>${project.build.directory}/classes/initial/akka.conf</file>
                 <type>xml</type>
               <artifact>
                 <file>${project.build.directory}/classes/initial/akka.conf</file>
                 <type>xml</type>

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
deleted file mode 100644 (file)
index 30efc61..0000000
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- 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
-
- NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept
-       for backward compatibility and runtime modifications will not be honored. In
-       addition, this file is overwritten on feature re-install.
--->
-<snapshot>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:concurrent-data-broker">prefix:dom-concurrent-data-broker</type>
-                    <name>concurrent-data-broker</name>
-
-                    <schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                        <name>yang-schema-service</name>
-                    </schema-service>
-
-                    <config-data-store>
-                        <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                        <name>distributed-config-store-service</name>
-                    </config-data-store>
-
-                    <operational-data-store>
-                        <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                        <name>distributed-operational-store-service</name>
-                    </operational-data-store>
-                </module>
-
-                <module>
-                    <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl">as:actor-system-provider-impl</type>
-                    <name>actor-system-provider-impl</name>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider">prefix:distributed-operational-datastore-provider</type>
-                    <name>distributed-operational-store-module</name>
-                    <operational-schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                        <name>yang-schema-service</name>
-                    </operational-schema-service>
-                    <operational-actor-system-provider>
-                        <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
-                        <name>actor-system-provider</name>
-                    </operational-actor-system-provider>
-                    <operational-properties>
-                        <persistent>false</persistent>
-                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
-                    </operational-properties>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider">prefix:distributed-config-datastore-provider</type>
-                    <name>distributed-config-store-module</name>
-                    <config-schema-service>
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
-                        <name>yang-schema-service</name>
-                    </config-schema-service>
-                    <config-actor-system-provider>
-                        <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
-                        <name>actor-system-provider</name>
-                    </config-actor-system-provider>
-                    <config-properties>
-                        <shard-election-timeout-factor>20</shard-election-timeout-factor>
-                    </config-properties>
-                </module>
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-
-                <service>
-                    <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
-                    <instance>
-                        <name>actor-system-provider</name>
-                        <provider>/modules/module[type='actor-system-provider-impl'][name='actor-system-provider-impl']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
-                    <instance>
-                        <name>distributed-config-store-service</name>
-                        <provider>/modules/module[type='distributed-config-datastore-provider'][name='distributed-config-store-module']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
-                    <instance>
-                        <name>distributed-operational-store-service</name>
-                        <provider>/modules/module[type='distributed-operational-datastore-provider'][name='distributed-operational-store-module']</provider>
-                    </instance>
-                </service>
-
-                <!-- Overrides the definition from 01-md-sal.xml -->
-                <service>
-                    <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
-                    <instance>
-                        <name>inmemory-data-broker</name>
-                        <provider>/modules/module[type='dom-concurrent-data-broker'][name='concurrent-data-broker']</provider>
-                    </instance>
-                </service>
-
-            </services>
-        </data>
-    </configuration>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:concurrent-data-broker?module=odl-concurrent-data-broker-cfg&amp;revision=2014-11-24</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service?module=actor-system-provider-service&amp;revision=2015-10-05</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl?module=actor-system-provider-impl&amp;revision=2015-10-05</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider?module=distributed-datastore-provider&amp;revision=2014-06-12</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store?module=opendaylight-config-dom-datastore&amp;revision=2014-06-17</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store?module=opendaylight-operational-dom-datastore&amp;revision=2014-06-17</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-    </required-capabilities>
-</snapshot>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 87544ecc6285c27f69cb5289fd13a6602d2739ff..006bce6a237f3f493c3e65e7fc8d5510bbb6fcd4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -113,10 +113,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-clustering-commons</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-clustering-commons</artifactId>


@@ -129,10 +125,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-dom-broker-config</artifactId>
-    </dependency>

 
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
 
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>


@@ -150,6 +142,10 @@
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-dom-broker</artifactId>
     </dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-dom-broker</artifactId>
     </dependency>

+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-spi</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-spi</artifactId>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
similarity index 96%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderImpl.java
rename to opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
index ef2db4b0c19d5695c0327822ee66c973dc148098..14aedffd2ab59ecd866df71d66eaf6827adb2b28 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.config.yang.config.actor_system_provider.impl;
+package org.opendaylight.controller.cluster.akka.impl;

 
 import akka.actor.ActorSystem;
 import akka.actor.Props;
 
 import akka.actor.ActorSystem;
 import akka.actor.Props;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/AkkaConfigFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/AkkaConfigFactory.java
similarity index 89%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/AkkaConfigFactory.java
rename to opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/AkkaConfigFactory.java
index 0eac56f61cb99592158ae4364350bbbfeada96ed..f29e1c7875b9ca4091fd3649651cf7df066134b6 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/AkkaConfigFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/AkkaConfigFactory.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.config.yang.config.actor_system_provider.impl.factory;
+package org.opendaylight.controller.cluster.akka.impl;

 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/BundleClassLoaderFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/BundleClassLoaderFactory.java
similarity index 90%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/BundleClassLoaderFactory.java
rename to opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/BundleClassLoaderFactory.java
index f01e85d53133f57db80fa8918d412397b9ab533f..306074f7f4990fed0e70801a66e759155505cf0a 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/BundleClassLoaderFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/BundleClassLoaderFactory.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.config.yang.config.actor_system_provider.impl.factory.osgi;
+package org.opendaylight.controller.cluster.akka.osgi.impl;

 
 import akka.osgi.BundleDelegatingClassLoader;
 import java.security.AccessController;
 
 import akka.osgi.BundleDelegatingClassLoader;
 import java.security.AccessController;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/QuarantinedMonitorActorPropsFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
similarity index 91%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/QuarantinedMonitorActorPropsFactory.java
rename to opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
index 50a7647754b85130fe2b03ba1974ce5761dd9416..31d68d9b6a6dd83cc17ec89fe1568d8ab65b95a7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/factory/osgi/QuarantinedMonitorActorPropsFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * 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.config.yang.config.actor_system_provider.impl.factory.osgi;
+package org.opendaylight.controller.cluster.akka.osgi.impl;

 
 import akka.actor.Props;
 import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;
 
 import akka.actor.Props;
 import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java
deleted file mode 100644 (file)
index 1981c20..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2015 Brocade Communications 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.config.yang.config.actor_system_provider.impl;
-
-import akka.actor.ActorSystem;
-import com.google.common.collect.ForwardingObject;
-import org.opendaylight.controller.cluster.ActorSystemProvider;
-import org.opendaylight.controller.cluster.ActorSystemProviderListener;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.osgi.framework.BundleContext;
-
-public class ActorSystemProviderModule extends AbstractActorSystemProviderModule {
-    private BundleContext bundleContext;
-
-    public ActorSystemProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public ActorSystemProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver,
-            ActorSystemProviderModule oldModule, AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public boolean canReuseInstance(AbstractActorSystemProviderModule oldModule) {
-        return true;
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // The service is provided via blueprint so wait for and return it here for backwards compatibility.
-        WaitingServiceTracker<ActorSystemProvider> tracker = WaitingServiceTracker.create(
-                ActorSystemProvider.class, bundleContext);
-        ActorSystemProvider delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        return new ForwardingActorSystemProvider(delegate, tracker);
-    }
-
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    private static class ForwardingActorSystemProvider extends ForwardingObject
-            implements ActorSystemProvider, AutoCloseable {
-        private final ActorSystemProvider delegate;
-        private final AutoCloseable closeable;
-
-        ForwardingActorSystemProvider(ActorSystemProvider delegate, AutoCloseable closeable) {
-            this.delegate = delegate;
-            this.closeable = closeable;
-        }
-
-        @Override
-        public ActorSystem getActorSystem() {
-            return delegate().getActorSystem();
-        }
-
-        @Override
-        public ListenerRegistration<ActorSystemProviderListener> registerActorSystemProviderListener(
-                ActorSystemProviderListener listener) {
-            return delegate().registerActorSystemProviderListener(listener);
-        }
-
-        @Override
-        protected ActorSystemProvider delegate() {
-            return delegate;
-        }
-
-        @Override
-        public void close() throws Exception {
-            // We don't close the delegate as the life-cycle is controlled via blueprint.
-            closeable.close();
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModuleFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModuleFactory.java
deleted file mode 100644 (file)
index 9e15085..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModuleFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2015 Brocade Communications 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
- */
-
-/*
-* Generated file
-*
-* Generated from: yang module name: actor-system-provider-impl yang module local name: actor-system-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Oct 06 02:11:27 EDT 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.config.actor_system_provider.impl;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-
-public class ActorSystemProviderModuleFactory extends AbstractActorSystemProviderModuleFactory {
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        ActorSystemProviderModule module = (ActorSystemProviderModule)super.createModule(instanceName,
-                dependencyResolver,bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            DynamicMBeanWithInstance old, BundleContext bundleContext) throws Exception {
-        ActorSystemProviderModule module = (ActorSystemProviderModule)super.createModule(instanceName,
-                dependencyResolver,
-                old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModule.java
deleted file mode 100644 (file)
index 6723d2b..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModule.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.config.concurrent_data_broker;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.spi.ForwardingDOMDataBroker;
-import org.osgi.framework.BundleContext;
-
-public class DomConcurrentDataBrokerModule extends AbstractDomConcurrentDataBrokerModule {
-    private BundleContext bundleContext;
-
-    public DomConcurrentDataBrokerModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DomConcurrentDataBrokerModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final DomConcurrentDataBrokerModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public boolean canReuseInstance(AbstractDomConcurrentDataBrokerModule oldModule) {
-        return true;
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // The ConcurrentDOMDataBroker is provided via blueprint so wait for and return it here for
-        // backwards compatibility.
-        WaitingServiceTracker<DOMDataBroker> tracker = WaitingServiceTracker.create(
-                DOMDataBroker.class, bundleContext, "(type=default)");
-        DOMDataBroker delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        return new ForwardingConcurrentDOMBroker(delegate, tracker);
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    private static class ForwardingConcurrentDOMBroker extends ForwardingDOMDataBroker implements AutoCloseable {
-        private final DOMDataBroker delegate;
-        private final AutoCloseable closeable;
-
-        ForwardingConcurrentDOMBroker(DOMDataBroker delegate, AutoCloseable closeable) {
-            this.delegate = delegate;
-            this.closeable = closeable;
-        }
-
-        @Override
-        protected DOMDataBroker delegate() {
-            return delegate;
-        }
-
-        @Override
-        public void close() throws Exception {
-            // We don't close the delegate as the life-cycle is controlled via blueprint.
-            closeable.close();
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModuleFactory.java
deleted file mode 100644 (file)
index b44abc9..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/concurrent_data_broker/DomConcurrentDataBrokerModuleFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.config.concurrent_data_broker;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-
-public class DomConcurrentDataBrokerModuleFactory extends AbstractDomConcurrentDataBrokerModuleFactory {
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        DomConcurrentDataBrokerModule module = (DomConcurrentDataBrokerModule)super.createModule(instanceName,
-                dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old,
-            BundleContext bundleContext) throws Exception {
-        DomConcurrentDataBrokerModule module = (DomConcurrentDataBrokerModule)super.createModule(instanceName,
-                dependencyResolver, old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java
deleted file mode 100644 (file)
index 2163449..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2014, 2015 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.config.yang.config.distributed_datastore_provider;
-
-import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface;
-import org.opendaylight.controller.cluster.datastore.compat.LegacyDOMStoreAdapter;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.osgi.framework.BundleContext;
-
-@Deprecated
-public class DistributedConfigDataStoreProviderModule extends AbstractDistributedConfigDataStoreProviderModule {
-    private BundleContext bundleContext;
-
-    public DistributedConfigDataStoreProviderModule(
-        final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-        final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DistributedConfigDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final DistributedConfigDataStoreProviderModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public boolean canReuseInstance(final AbstractDistributedConfigDataStoreProviderModule oldModule) {
-        return true;
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // The DistributedConfigDataStore is provided via blueprint so wait for and return it here for
-        // backwards compatibility.
-        WaitingServiceTracker<DistributedDataStoreInterface> tracker = WaitingServiceTracker.create(
-                DistributedDataStoreInterface.class, bundleContext, "(type=distributed-config)");
-        DistributedDataStoreInterface delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        return new LegacyDOMStoreAdapter(delegate) {
-            @Override
-            public void close() {
-                tracker.close();
-            }
-        };
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModuleFactory.java
deleted file mode 100644 (file)
index d645499..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModuleFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2014, 2015 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.config.yang.config.distributed_datastore_provider;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-
-@Deprecated
-public class DistributedConfigDataStoreProviderModuleFactory
-        extends AbstractDistributedConfigDataStoreProviderModuleFactory {
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        DistributedConfigDataStoreProviderModule module = (DistributedConfigDataStoreProviderModule)super.createModule(
-                instanceName,dependencyResolver,bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-        DynamicMBeanWithInstance old, BundleContext bundleContext) throws Exception {
-        DistributedConfigDataStoreProviderModule module = (DistributedConfigDataStoreProviderModule)super.createModule(
-                instanceName, dependencyResolver, old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java
deleted file mode 100644 (file)
index d06d2ec..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2014, 2015 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.config.yang.config.distributed_datastore_provider;
-
-import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface;
-import org.opendaylight.controller.cluster.datastore.compat.LegacyDOMStoreAdapter;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.osgi.framework.BundleContext;
-
-@Deprecated
-public class DistributedOperationalDataStoreProviderModule
-        extends AbstractDistributedOperationalDataStoreProviderModule {
-    private BundleContext bundleContext;
-
-    public DistributedOperationalDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DistributedOperationalDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver,final DistributedOperationalDataStoreProviderModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public boolean canReuseInstance(final AbstractDistributedOperationalDataStoreProviderModule oldModule) {
-        return true;
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        // The DistributedOperDataStore is provided via blueprint so wait for and return it here for
-        // backwards compatibility
-        WaitingServiceTracker<DistributedDataStoreInterface> tracker = WaitingServiceTracker.create(
-                DistributedDataStoreInterface.class, bundleContext, "(type=distributed-operational)");
-        DistributedDataStoreInterface delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        return new LegacyDOMStoreAdapter(delegate) {
-            @Override
-            public void close() {
-                tracker.close();
-            }
-        };
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModuleFactory.java
deleted file mode 100644 (file)
index 072eceb..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModuleFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2014, 2015 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.config.yang.config.distributed_datastore_provider;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-
-@Deprecated
-public class DistributedOperationalDataStoreProviderModuleFactory
-        extends AbstractDistributedOperationalDataStoreProviderModuleFactory {
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        DistributedOperationalDataStoreProviderModule module = (DistributedOperationalDataStoreProviderModule)
-                super.createModule(instanceName,dependencyResolver,bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-        DynamicMBeanWithInstance old, BundleContext bundleContext) throws Exception {
-        DistributedOperationalDataStoreProviderModule module = (DistributedOperationalDataStoreProviderModule)
-                super.createModule(instanceName, dependencyResolver,
-            old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml b/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
index cda74adf859b2f0364f179248c4327479c63cd57..e0153cbaae07bcb1d3cc23c346f852d59f6a33f3 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/org/opendaylight/blueprint/clustered-datastore.xml
@@ -16,23 +16,23 @@
 
   <!-- ActorSystemProvider -->
 
 
   <!-- ActorSystemProvider -->
 

-  <bean id="bundleClassLoader" class="org.opendaylight.controller.config.yang.config.actor_system_provider.impl.factory.osgi.BundleClassLoaderFactory"
+  <bean id="bundleClassLoader" class="org.opendaylight.controller.cluster.akka.osgi.impl.BundleClassLoaderFactory"

           factory-method="createClassLoader">
     <argument ref="blueprintBundleContext" />
   </bean>
 
           factory-method="createClassLoader">
     <argument ref="blueprintBundleContext" />
   </bean>
 

-  <bean id="actorSystemProps" class="org.opendaylight.controller.config.yang.config.actor_system_provider.impl.factory.osgi.QuarantinedMonitorActorPropsFactory"
+  <bean id="actorSystemProps" class="org.opendaylight.controller.cluster.akka.osgi.impl.QuarantinedMonitorActorPropsFactory"

           factory-method="createProps">
     <argument ref="blueprintBundleContext" />
   </bean>
 
   <bean id="akkaReader" class="org.opendaylight.controller.cluster.common.actor.FileAkkaConfigurationReader"/>
           factory-method="createProps">
     <argument ref="blueprintBundleContext" />
   </bean>
 
   <bean id="akkaReader" class="org.opendaylight.controller.cluster.common.actor.FileAkkaConfigurationReader"/>

-  <bean id="akkaConfig" class="org.opendaylight.controller.config.yang.config.actor_system_provider.impl.factory.AkkaConfigFactory"
+  <bean id="akkaConfig" class="org.opendaylight.controller.cluster.akka.impl.AkkaConfigFactory"

           factory-method="createAkkaConfig">
     <argument ref="akkaReader" />
   </bean>
 
           factory-method="createAkkaConfig">
     <argument ref="akkaReader" />
   </bean>
 

-  <bean id="actorSystemProvider" class="org.opendaylight.controller.config.yang.config.actor_system_provider.impl.ActorSystemProviderImpl"
+  <bean id="actorSystemProvider" class="org.opendaylight.controller.cluster.akka.impl.ActorSystemProviderImpl"

           destroy-method="close">
     <argument ref="bundleClassLoader" />
     <argument ref="actorSystemProps"/>
           destroy-method="close">
     <argument ref="bundleClassLoader" />
     <argument ref="actorSystemProps"/>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/actor-system-provider-impl.yang b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/actor-system-provider-impl.yang
deleted file mode 100644 (file)
index 75d6125..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/actor-system-provider-impl.yang
+++ /dev/null
@@ -1,26 +0,0 @@
-module actor-system-provider-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl";
-    prefix "actor-system-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import actor-system-provider-service {prefix actor-system;}
-
-    description "Akka actor system provider implementation";
-
-    revision "2015-10-05" {
-        description "Initial revision";
-    }
-
-    identity actor-system-provider-impl {
-        base config:module-type;
-        config:provided-service actor-system:actor-system-provider-service;
-        config:java-name-prefix ActorSystemProvider;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case actor-system-provider-impl {
-            when "/config:modules/config:module/config:type = 'actor-system-provider-impl'";
-        }
-    }
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
index be658835be0c0162b3d9b6feb192f311d99fa6b9..a49ca8a47dc2ee41b42cb525e9b7d2b994b20760 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/distributed-datastore-provider.yang
@@ -5,13 +5,6 @@ module distributed-datastore-provider {
     namespace "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider";
     prefix "distributed-datastore-provider";
 
     namespace "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider";
     prefix "distributed-datastore-provider";
 

-    import config { prefix config; revision-date 2013-04-05; }
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-    import opendaylight-config-dom-datastore {prefix config-dom-store-spi;}
-    import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;}
-    import opendaylight-md-sal-dom {prefix sal;}
-    import actor-system-provider-service {prefix actor-system;}
-

     description
         "This module contains the base YANG definitions for
         the distributed datastore provider implementation";
     description
         "This module contains the base YANG definitions for
         the distributed datastore provider implementation";


@@ -21,22 +14,6 @@ module distributed-datastore-provider {
             "Initial revision.";
     }
 
             "Initial revision.";
     }
 

-    // This is the definition of the service implementation as a module identity.
-    identity distributed-config-datastore-provider {
-            base config:module-type;
-            config:provided-service config-dom-store-spi:config-dom-datastore;
-            // Specifies the prefix for generated java classes.
-            config:java-name-prefix DistributedConfigDataStoreProvider;
-    }
-
-     // This is the definition of the service implementation as a module identity.
-     identity distributed-operational-datastore-provider {
-                base config:module-type;
-                config:provided-service operational-dom-store-spi:operational-dom-datastore;
-                // Specifies the prefix for generated java classes.
-                config:java-name-prefix DistributedOperationalDataStoreProvider;
-     }
-

     typedef non-zero-uint32-type {
         type uint32 {
             range "1..max";
     typedef non-zero-uint32-type {
         type uint32 {
             range "1..max";


@@ -289,60 +266,4 @@ module distributed-datastore-provider {
     container data-store-properties-container {
         uses data-store-properties;
     }
     container data-store-properties-container {
         uses data-store-properties;
     }

-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case distributed-config-datastore-provider {
-            when "/config:modules/config:module/config:type = 'distributed-config-datastore-provider'";
-                container config-schema-service {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:schema-service;
-                        }
-                    }
-                }
-
-                container config-actor-system-provider {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity actor-system:actor-system-provider-service;
-                        }
-                    }
-                }
-
-                container config-properties {
-                    uses data-store-properties;
-                }
-        }
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case distributed-operational-datastore-provider {
-            when "/config:modules/config:module/config:type = 'distributed-operational-datastore-provider'";
-                container operational-schema-service {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:schema-service;
-                        }
-                    }
-                }
-
-                container operational-actor-system-provider {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity actor-system:actor-system-provider-service;
-                        }
-                    }
-                }
-
-                container operational-properties {
-                    uses data-store-properties;
-                }
-        }
-    }

 }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/odl-sal-cds-cfg.yang b/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/odl-sal-cds-cfg.yang
deleted file mode 100644 (file)
index 325dad3..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/yang/odl-sal-cds-cfg.yang
+++ /dev/null
@@ -1,41 +0,0 @@
-module odl-concurrent-data-broker-cfg {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:concurrent-data-broker";
-    prefix "cdb";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-config-dom-datastore {prefix config-dom-store-spi;}
-    import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;}
-    import opendaylight-md-sal-dom {prefix sal; }
-    import opendaylight-sal-dom-broker-impl { prefix broker; }
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-
-    description
-        "Service definition for concurrent dom broker.";
-
-    revision "2014-11-24" {
-        description
-            "Initial revision";
-    }
-
-    identity dom-concurrent-data-broker {
-        base config:module-type;
-        config:provided-service sal:dom-async-data-broker;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case dom-concurrent-data-broker {
-            when "/config:modules/config:module/config:type = 'dom-concurrent-data-broker'";
-
-            uses broker:dom-broker-config;
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case dom-concurrent-data-broker {
-            when "/config:modules/config:module/config:type = 'dom-concurrent-data-broker'";
-
-            uses broker:dom-broker-operational;
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml
deleted file mode 100644 (file)
index f0ed089..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-
-  <artifactId>sal-dom-broker-config</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <!-- The Java classes are mostly config yang-generated wjich we don't want analyzed by findbugs.
-         However the generated package names don't conform to the findbugs exclusion filter
-         hence we explicitly skip findbugs. -->
-    <findbugs.skip>true</findbugs.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-dom-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-broker-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-               {local-packages},
-               org.opendaylight.controller.config.yang.md.sal.dom.impl,
-               org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.impl.*
-             </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
-</project>

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java
deleted file mode 100644 (file)
index 46b23fa..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.MutableClassToInstanceMap;
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.sal.core.api.BrokerService;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.controller.sal.dom.broker.BrokerImpl;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class DomBrokerImplModule extends AbstractDomBrokerImplModule {
-    private static final Logger LOG = LoggerFactory.getLogger(DomBrokerImplModule.class);
-
-    private BundleContext bundleContext;
-
-    public DomBrokerImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DomBrokerImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver,
-            final DomBrokerImplModule oldModule, final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-        final long depth = getNotificationQueueDepth().getValue();
-        Preconditions.checkArgument(Long.lowestOneBit(depth) == Long.highestOneBit(depth),
-                "Queue depth %s is not power-of-two", depth);
-    }
-
-    @Override
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public AutoCloseable createInstance() {
-        // The services are provided via blueprint so retrieve then from the OSGi service registry for
-        // backwards compatibility.
-
-        final List<AutoCloseable> closeables = new ArrayList<>();
-        DOMNotificationService domNotificationService = newTracker(
-                DOMNotificationService.class, closeables).waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        DOMNotificationPublishService domNotificationPublishService = newTracker(
-                DOMNotificationPublishService.class, closeables).waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        DOMRpcService domRpcService = newTracker(
-                DOMRpcService.class, closeables).waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        DOMRpcProviderService domRpcProvider = newTracker(
-                DOMRpcProviderService.class, closeables).waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        DOMMountPointService mountService = newTracker(DOMMountPointService.class, closeables)
-                .waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        SchemaService globalSchemaService = newTracker(SchemaService.class, closeables)
-                .waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        final DOMDataBroker dataBroker = getAsyncDataBrokerDependency();
-
-        final ClassToInstanceMap<BrokerService> services = MutableClassToInstanceMap.create();
-
-        services.putInstance(DOMNotificationService.class, domNotificationService);
-        services.putInstance(DOMNotificationPublishService.class, domNotificationPublishService);
-
-        final SchemaService schemaService = getSchemaServiceImpl(globalSchemaService);
-        services.putInstance(SchemaService.class, schemaService);
-
-        services.putInstance(DOMDataBroker.class, dataBroker);
-
-        services.putInstance(DOMRpcService.class, domRpcService);
-        services.putInstance(DOMRpcProviderService.class, domRpcProvider);
-
-        services.putInstance(DOMMountPointService.class, mountService);
-
-        BrokerImpl broker = new BrokerImpl(domRpcService, domRpcProvider, services);
-        broker.setDeactivator(() -> {
-            for (AutoCloseable ac : closeables) {
-                try {
-                    ac.close();
-                } catch (Exception e) {
-                    LOG.warn("Exception while closing {}", ac, e);
-                }
-            }
-        });
-
-        return broker;
-    }
-
-    private <T> WaitingServiceTracker<T> newTracker(Class<T> serviceInterface, List<AutoCloseable> closeables) {
-        WaitingServiceTracker<T> tracker = WaitingServiceTracker.create(serviceInterface, bundleContext);
-        closeables.add(tracker);
-        return tracker;
-    }
-
-    private SchemaService getSchemaServiceImpl(SchemaService globalSchemaService) {
-        final SchemaService schemaService;
-        if (getRootSchemaService() != null) {
-            schemaService = getRootSchemaServiceDependency();
-        } else {
-            schemaService = globalSchemaService;
-        }
-        return schemaService;
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index 87900d8..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
-import org.opendaylight.controller.config.spi.Module;
-import org.osgi.framework.BundleContext;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class DomBrokerImplModuleFactory extends AbstractDomBrokerImplModuleFactory {
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        DomBrokerImplModule module = (DomBrokerImplModule)super.createModule(instanceName, dependencyResolver,
-                bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old,
-            BundleContext bundleContext) throws Exception {
-        DomBrokerImplModule module = (DomBrokerImplModule)super.createModule(instanceName, dependencyResolver,
-                old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java
deleted file mode 100644 (file)
index 05726e1..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-import com.google.common.collect.Lists;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitDeadlockException;
-import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
-import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStatsMXBeanImpl;
-import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.broker.impl.jmx.CommitStatsMXBeanImpl;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory;
-import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.yangtools.util.DurationStatisticsTracker;
-import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExecutorService;
-import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by the clustered data store.
- */
-@Deprecated
-public final class DomInmemoryDataBrokerModule extends
-        org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule {
-
-    private static final String JMX_BEAN_TYPE = "DOMDataBroker";
-
-    public DomInmemoryDataBrokerModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DomInmemoryDataBrokerModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final DomInmemoryDataBrokerModule oldModule, final 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() {
-        //Initializing Operational DOM DataStore defaulting to InMemoryDOMDataStore if one is not configured
-        DOMStore operStore =  getOperationalDataStoreDependency();
-        if (operStore == null) {
-            // we will default to InMemoryDOMDataStore creation
-            operStore = InMemoryDOMDataStoreFactory.create("DOM-OPER", getSchemaServiceDependency());
-        }
-
-        DOMStore configStore = getConfigDataStoreDependency();
-        if (configStore == null) {
-            // we will default to InMemoryDOMDataStore creation
-            configStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", getSchemaServiceDependency());
-        }
-
-        final Map<LogicalDatastoreType, DOMStore> datastores = new EnumMap<>(LogicalDatastoreType.class);
-        datastores.put(LogicalDatastoreType.OPERATIONAL, operStore);
-        datastores.put(LogicalDatastoreType.CONFIGURATION, configStore);
-
-        /*
-         * We use an executor for commit ListenableFuture callbacks that favors reusing available
-         * threads over creating new threads at the expense of execution time. The assumption is
-         * that most ListenableFuture callbacks won't execute a lot of business logic where we want
-         * it to run quicker - many callbacks will likely just handle error conditions and do
-         * nothing on success. The executor queue capacity is bounded and, if the capacity is
-         * reached, subsequent submitted tasks will block the caller.
-         */
-        ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool(
-                getMaxDataBrokerFutureCallbackPoolSize(), getMaxDataBrokerFutureCallbackQueueSize(),
-                "CommitFutures", SerializedDOMDataBroker.class);
-
-        final List<AbstractMXBean> mBeans = Lists.newArrayList();
-        final DurationStatisticsTracker commitStatsTracker;
-
-        /*
-         * We use a single-threaded executor for commits with a bounded queue capacity. If the
-         * queue capacity is reached, subsequent commit tasks will be rejected and the commits will
-         * fail. This is done to relieve back pressure. This should be an extreme scenario - either
-         * there's deadlock(s) somewhere and the controller is unstable or some rogue component is
-         * continuously hammering commits too fast or the controller is just over-capacity for the
-         * system it's running on.
-         */
-        ExecutorService commitExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(
-            getMaxDataBrokerCommitQueueSize(), "WriteTxCommit", SerializedDOMDataBroker.class);
-
-        SerializedDOMDataBroker sdb = new SerializedDOMDataBroker(datastores,
-            new DeadlockDetectingListeningExecutorService(commitExecutor,
-                TransactionCommitDeadlockException.DEADLOCK_EXCEPTION_SUPPLIER,
-                listenableFutureExecutor));
-        commitStatsTracker = sdb.getCommitStatsTracker();
-
-        final AbstractMXBean commitExecutorStatsMXBean =
-                ThreadExecutorStatsMXBeanImpl.create(commitExecutor, "CommitExecutorStats",
-                    JMX_BEAN_TYPE, null);
-        if (commitExecutorStatsMXBean != null) {
-            mBeans.add(commitExecutorStatsMXBean);
-        }
-
-        if (commitStatsTracker != null) {
-            final CommitStatsMXBeanImpl commitStatsMXBean = new CommitStatsMXBeanImpl(
-                    commitStatsTracker, JMX_BEAN_TYPE);
-            commitStatsMXBean.registerMBean();
-            mBeans.add(commitStatsMXBean);
-        }
-
-        final AbstractMXBean commitFutureStatsMXBean =
-                ThreadExecutorStatsMXBeanImpl.create(listenableFutureExecutor,
-                        "CommitFutureExecutorStats", JMX_BEAN_TYPE, null);
-        if (commitFutureStatsMXBean != null) {
-            mBeans.add(commitFutureStatsMXBean);
-        }
-
-        sdb.setCloseable(() -> mBeans.forEach(AbstractMXBean::unregisterMBean));
-
-        return sdb;
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java
deleted file mode 100644 (file)
index 9134770..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by the clustered data store.
- */
-@Deprecated
-public class DomInmemoryDataBrokerModuleFactory extends AbstractDomInmemoryDataBrokerModuleFactory {
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java
deleted file mode 100644 (file)
index e5d1e51..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.controller.sal.core.api.model.YangTextSourceProvider;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class SchemaServiceImplSingletonModule extends AbstractSchemaServiceImplSingletonModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SchemaServiceImplSingletonModule.class);
-
-    BundleContext bundleContext;
-
-    public SchemaServiceImplSingletonModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public SchemaServiceImplSingletonModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final SchemaServiceImplSingletonModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public boolean canReuseInstance(final AbstractSchemaServiceImplSingletonModule oldModule) {
-        return true;
-    }
-
-    public BundleContext getBundleContext() {
-        return bundleContext;
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        final WaitingServiceTracker<SchemaService> schemaServiceTracker =
-                WaitingServiceTracker.create(SchemaService.class, bundleContext);
-        final SchemaService schemaService = schemaServiceTracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        final WaitingServiceTracker<YangTextSourceProvider> sourceProviderTracker =
-                WaitingServiceTracker.create(YangTextSourceProvider.class, bundleContext);
-        final YangTextSourceProvider sourceProvider =
-                sourceProviderTracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        class GlobalSchemaServiceProxy implements AutoCloseable, SchemaService, YangTextSourceProvider {
-            @Override
-            public void close() {
-                schemaServiceTracker.close();
-                sourceProviderTracker.close();
-            }
-
-            @Override
-            public void addModule(final Module arg0) {
-                schemaService.addModule(arg0);
-            }
-
-            @Override
-            public SchemaContext getGlobalContext() {
-                return schemaService.getGlobalContext();
-            }
-
-            @Override
-            public SchemaContext getSessionContext() {
-                return schemaService.getSessionContext();
-            }
-
-            @Override
-            public ListenerRegistration<SchemaContextListener> registerSchemaContextListener(
-                    final SchemaContextListener arg0) {
-                return schemaService.registerSchemaContextListener(arg0);
-            }
-
-            @Override
-            public void removeModule(final Module arg0) {
-                schemaService.removeModule(arg0);
-            }
-
-            @Override
-            public ListenableFuture<? extends YangTextSchemaSource> getSource(
-                    final SourceIdentifier sourceIdentifier) {
-                return sourceProvider.getSource(sourceIdentifier);
-            }
-        }
-
-        return new GlobalSchemaServiceProxy();
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java
deleted file mode 100644 (file)
index 44039b8..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.impl;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class SchemaServiceImplSingletonModuleFactory extends
-        org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModuleFactory {
-
-    public static final String SINGLETON_NAME = "yang-schema-service";
-
-    @Override
-    public SchemaServiceImplSingletonModule instantiateModule(String instanceName,
-            DependencyResolver dependencyResolver, SchemaServiceImplSingletonModule oldModule,
-            AutoCloseable oldInstance, BundleContext bundleContext) {
-        checkArgument(SINGLETON_NAME.equals(instanceName),
-                "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME);
-        SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule,
-                oldInstance, bundleContext);
-        // FIXME bundle context should not be passed around
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public SchemaServiceImplSingletonModule instantiateModule(String instanceName,
-            DependencyResolver dependencyResolver, BundleContext bundleContext) {
-        checkArgument(SINGLETON_NAME.equals(instanceName),
-                "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME);
-        SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver,
-                bundleContext);
-        // FIXME bundle context should not be passed around
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java
deleted file mode 100644 (file)
index 06140f4..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.pingpong;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.dom.broker.impl.PingPongDataBroker;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class PingpongDataBrokerModule extends AbstractPingpongDataBrokerModule {
-    public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver,
-            final PingpongDataBrokerModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new PingPongDataBroker(getDataBrokerDependency());
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java
deleted file mode 100644 (file)
index c5ed639..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.md.sal.dom.pingpong;
-
-/**
- * Deprecated.
- *
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class PingpongDataBrokerModuleFactory extends AbstractPingpongDataBrokerModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang
deleted file mode 100644 (file)
index 5bda2d6..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang
+++ /dev/null
@@ -1,224 +0,0 @@
-module opendaylight-sal-dom-broker-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl";
-    prefix "broker";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import ietf-yang-types { prefix yang; }
-    import opendaylight-md-sal-dom {prefix sal;}
-    import opendaylight-md-sal-common {prefix common;}
-    import opendaylight-config-dom-datastore {prefix config-dom-store-spi;}
-    import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;}
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-
-    description
-        "Service definition for Binding Aware MD-SAL.
-        Note: The dom-inmemory-data-broker utilizes configurable config-dom-datastore
-        and operation-dom-datastore. If configuration is not done for this stores
-        then it defaults to InMemoryDOMDataStore";
-
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity dom-broker-impl {
-        status deprecated;
-        base config:module-type;
-        config:provided-service sal:dom-broker-osgi-registry;
-        config:java-name-prefix DomBrokerImpl;
-    }
-
-
-    identity dom-inmemory-data-broker {
-        status obsolete;
-        base config:module-type;
-        config:provided-service sal:dom-async-data-broker;
-    }
-
-    identity schema-service-singleton {
-        status deprecated;
-        base config:module-type;
-        config:provided-service sal:schema-service;
-        config:provided-service sal:yang-text-source-provider;
-        config:java-name-prefix SchemaServiceImplSingleton;
-    }
-
-    typedef max-queue-depth {
-        type uint32 {
-            range 1..1073741824;
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case dom-broker-impl {
-            when "/config:modules/config:module/config:type = 'dom-broker-impl'";
-
-            container async-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity sal:dom-async-data-broker;
-                    }
-                }
-            }
-
-            container root-schema-service {
-                status obsolete;
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity sal:schema-service;
-                    }
-                }
-            }
-
-            leaf notification-queue-depth {
-                status obsolete;
-                description "Maximum number of elements in the notification queue, must be power-of-two.";
-                type max-queue-depth;
-                default 65536;
-            }
-            leaf notification-queue-spin {
-                status obsolete;
-                description "Number of milliseconds notification queue should spin for new requests before parking.";
-                type uint16;
-                units milliseconds;
-                default 1;
-            }
-            leaf notification-queue-park {
-                status obsolete;
-                description "Number of milliseconds notification queue should park for new requests before blocking.";
-                type uint16;
-                units milliseconds;
-                default 30;
-            }
-        }
-    }
-
-    grouping dom-broker-config {
-        status obsolete;
-        container schema-service {
-            uses config:service-ref {
-                refine type {
-                    mandatory false;
-                    config:required-identity sal:schema-service;
-                }
-            }
-        }
-
-        container config-data-store {
-             uses config:service-ref {
-                 refine type {
-                     mandatory false;
-                     config:required-identity config-dom-store-spi:config-dom-datastore;
-                 }
-             }
-        }
-
-        container operational-data-store {
-              uses config:service-ref {
-                   refine type {
-                       mandatory false;
-                       config:required-identity operational-dom-store-spi:operational-dom-datastore;
-                   }
-               }
-        }
-
-        leaf max-data-broker-future-callback-queue-size {
-            default 1000;
-            type uint16;
-            description "The maximum queue size for the data broker's commit future callback executor.";
-        }
-
-        leaf max-data-broker-future-callback-pool-size {
-            default 20;
-            type uint16;
-            description "The maximum thread pool size for the data broker's commit future callback executor.";
-        }
-
-        leaf max-data-broker-commit-queue-size {
-            default 5000;
-            type uint16;
-            description "The maximum queue size for the data broker's commit executor.";
-        }
-    }
-
-    grouping dom-broker-operational {
-        status obsolete;
-        leaf total-commits {
-            type uint64;
-        }
-
-        leaf average-commit {
-            type uint64;
-            units ns;
-        }
-
-        leaf longest-commit-duration {
-            type uint64;
-            units ns;
-        }
-
-        leaf longest-commit-timestamp {
-            type yang:date-and-time;
-        }
-
-        leaf shortest-commit-duration {
-            type uint64;
-            units ns;
-        }
-
-        leaf shortest-commit-timestamp {
-            type yang:date-and-time;
-        }
-
-        rpcx:rpc-context-instance dom-broker-rpc-ctx;
-    }
-
-    identity dom-broker-rpc-ctx;
-
-    rpc reset-statistics {
-        description
-          "JMX call to clear the toasts-made counter.";
-
-        input {
-            uses rpcx:rpc-context-ref {
-                refine context-instance {
-                    rpcx:rpc-context-instance dom-broker-rpc-ctx;
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case dom-inmemory-data-broker {
-            when "/config:modules/config:module/config:type = 'dom-inmemory-data-broker'";
-
-            uses dom-broker-config;
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case dom-inmemory-data-broker {
-            when "/config:modules/config:module/config:type = 'dom-inmemory-data-broker'";
-
-            uses dom-broker-operational;
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case schema-service-singleton {
-            when "/config:modules/config:module/config:type = 'schema-service-singleton'";
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case dom-broker-impl {
-            when "/config:modules/config:module/config:type = 'dom-broker-impl'";
-            container data {
-                uses common:data-state;
-            }
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-pingpong-broker.yang b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-pingpong-broker.yang
deleted file mode 100644 (file)
index 0ed1bbd..0000000
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-pingpong-broker.yang
+++ /dev/null
@@ -1,39 +0,0 @@
-module opendaylight-pingpong-broker {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:pingpong";
-    prefix "pingpong";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-dom {prefix sal;}
-    import opendaylight-md-sal-common {prefix common;}
-    import opendaylight-config-dom-datastore {prefix config-dom-store-spi;}
-    import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;}
-
-    description
-        "Service definition for Ping-Pong DOM broker";
-
-    revision "2014-11-07" {
-        description
-            "Initial revision";
-    }
-
-    identity pingpong-data-broker {
-        base config:module-type;
-        config:provided-service sal:dom-async-data-broker;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case pingpong-data-broker {
-            when "/config:modules/config:module/config:type = 'pingpong-data-broker'";
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:dom-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml
deleted file mode 100644 (file)
index 11e45c9..0000000
--- a/opendaylight/md-sal/sal-dom-config/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-  <artifactId>sal-dom-config</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-core-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-core-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-singleton-dom-impl</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
-</project>

diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-config-dom-datastore.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-config-dom-datastore.yang
deleted file mode 100644 (file)
index 4d9c7df..0000000
--- a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-config-dom-datastore.yang
+++ /dev/null
@@ -1,22 +0,0 @@
-module opendaylight-config-dom-datastore {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store";
-    prefix "config-dom-store-spi";
-
-       import config { prefix config; revision-date 2013-04-05; }
-
-        description
-            "DOM Service Provider Interface definition for MD-SAL config store";
-
-     revision "2014-06-17" {
-             description
-                 "Initial revision";
-         }
-
-     identity config-dom-datastore {
-         base "config:service-type";
-         config:java-class  "org.opendaylight.controller.sal.core.spi.data.DOMStore";
-         config:disable-osgi-service-registration;
-     }
-
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-common.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-common.yang
deleted file mode 100644 (file)
index ac2f924..0000000
--- a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-common.yang
+++ /dev/null
@@ -1,71 +0,0 @@
-module opendaylight-md-sal-common {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:common";
-    prefix "md-sal-common";
-    
-    description
-        "Common definition for MD-SAL.";
- 
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-    
-    grouping rpc-routing-table {
-        
-        leaf routing-context {
-            type string;
-        }
-        list routes {
-            leaf path {
-                type string;
-            }
-            leaf destination {
-                type string;
-            }
-        }
-    
-    }
-
-    grouping rpc-router {
-        leaf module {
-            type string;
-        }
-        container routing-tables {
-            list routing-table {
-                uses rpc-routing-table;
-            }
-        }
-    }
-
-    grouping rpc-state {
-        list rpc-router {
-            uses rpc-router;
-        }
-    }
-    
-    grouping notification-state {
-        container notifications {
-            leaf published {
-                type uint32;
-            }
-        }
-    }
-    
-    grouping data-state {
-        container transactions {
-            leaf created {
-                type uint32;
-            }
-            leaf submitted {
-                type uint32;
-            }
-            leaf successful {
-                type uint32;
-            }
-            leaf failed {
-                type uint32;
-            }
-        }
-    }
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-dom.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-dom.yang
deleted file mode 100644 (file)
index cf21279..0000000
--- a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-md-sal-dom.yang
+++ /dev/null
@@ -1,38 +0,0 @@
-module opendaylight-md-sal-dom {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom";
-    prefix "md-sal-dom";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
-
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity dom-broker-osgi-registry {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.core.api.Broker";
-    }
-
-    identity dom-async-data-broker {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.md.sal.dom.api.DOMDataBroker";
-        config:disable-osgi-service-registration;
-    }
-
-    identity schema-service {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.core.api.model.SchemaService";
-        config:disable-osgi-service-registration;
-    }
-
-    identity yang-text-source-provider {
-        base "config:service-type";
-        config:java-class "org.opendaylight.controller.sal.core.api.model.YangTextSourceProvider";
-        config:disable-osgi-service-registration;
-    }
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-operational-dom-datastore.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-operational-dom-datastore.yang
deleted file mode 100644 (file)
index 008010b..0000000
--- a/opendaylight/md-sal/sal-dom-config/src/main/yang/opendaylight-operational-dom-datastore.yang
+++ /dev/null
@@ -1,22 +0,0 @@
-module opendaylight-operational-dom-datastore {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store";
-    prefix "operational-dom-store-spi";
-
-       import config { prefix config; revision-date 2013-04-05; }
-
-        description
-            "DOM Service Provider Interface definition for MD-SAL operational store";
-
-     revision "2014-06-17" {
-             description
-                 "Initial revision";
-         }
-
-     identity operational-dom-datastore {
-         base "config:service-type";
-         config:java-class  "org.opendaylight.controller.sal.core.spi.data.DOMStore";
-         config:disable-osgi-service-registration;
-     }
-
-}
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
index 917ea4faf29dfdc29b80a4333ef23de86c83aa77..a1c37f8d4aadbee12ff76141fd10a65e58c5502c 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -59,11 +59,6 @@
       <artifactId>yang-data-impl</artifactId>
     </dependency>
 
       <artifactId>yang-data-impl</artifactId>
     </dependency>
 

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-dom-config</artifactId>
-    </dependency>
-

     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java
deleted file mode 100644 (file)
index 2d1f041..0000000
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.inmemory_datastore_provider;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory;
-import org.opendaylight.controller.md.sal.dom.store.impl.jmx.InMemoryDataStoreStats;
-
-/**
- * The in-memory data store isn't used anymore. Deprecation notice in Carbon. Removal plan in Nitrogen.
- */
-@Deprecated
-public class InMemoryConfigDataStoreProviderModule extends AbstractInMemoryConfigDataStoreProviderModule {
-
-    public InMemoryConfigDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InMemoryConfigDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final InMemoryConfigDataStoreProviderModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        InMemoryDOMDataStore dataStore = InMemoryDOMDataStoreFactory.create("DOM-CFG",
-            LogicalDatastoreType.CONFIGURATION, getSchemaServiceDependency(), getDebugTransactions(),
-            InMemoryDOMDataStoreConfigProperties.create(getMaxDataChangeExecutorPoolSize(),
-                getMaxDataChangeExecutorQueueSize(), getMaxDataChangeListenerQueueSize(),
-                getMaxDataStoreExecutorQueueSize()));
-
-        InMemoryDataStoreStats statsBean = new InMemoryDataStoreStats("InMemoryConfigDataStore", dataStore);
-        dataStore.setCloseable(statsBean);
-
-        return dataStore;
-    }
-}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java
deleted file mode 100644 (file)
index 9c439b6..0000000
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.inmemory_datastore_provider;
-
-/**
- * The in-memory data store isn't used anymore. Deprecation notice in Carbon. Removal plan in Nitrogen.
- */
-@Deprecated
-public class InMemoryConfigDataStoreProviderModuleFactory extends AbstractInMemoryConfigDataStoreProviderModuleFactory {
-
-}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java
deleted file mode 100644 (file)
index af81254..0000000
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.inmemory_datastore_provider;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties;
-import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory;
-import org.opendaylight.controller.md.sal.dom.store.impl.jmx.InMemoryDataStoreStats;
-
-/**
- * The in-memory data store isn't used anymore. Deprecation notice in Carbon. Removal plan in Nitrogen.
- */
-@Deprecated
-public class InMemoryOperationalDataStoreProviderModule extends AbstractInMemoryOperationalDataStoreProviderModule {
-
-    public InMemoryOperationalDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InMemoryOperationalDataStoreProviderModule(final ModuleIdentifier identifier,
-            final DependencyResolver dependencyResolver, final InMemoryOperationalDataStoreProviderModule oldModule,
-            final AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        InMemoryDOMDataStore dataStore = InMemoryDOMDataStoreFactory.create("DOM-OPER",
-            LogicalDatastoreType.OPERATIONAL, getSchemaServiceDependency(), getDebugTransactions(),
-            InMemoryDOMDataStoreConfigProperties.create(getMaxDataChangeExecutorPoolSize(),
-                getMaxDataChangeExecutorQueueSize(), getMaxDataChangeListenerQueueSize(),
-                getMaxDataStoreExecutorQueueSize()));
-
-        InMemoryDataStoreStats statsBean = new InMemoryDataStoreStats("InMemoryOperationalDataStore", dataStore);
-
-        dataStore.setCloseable(statsBean);
-
-        return dataStore;
-    }
-}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java
deleted file mode 100644 (file)
index 535c0c8..0000000
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2014 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.config.yang.inmemory_datastore_provider;
-
-/**
- * The in-memory data store isn't used anymore. Deprecation notice in Carbon. Removal plan in Nitrogen.
- */
-@Deprecated
-public class InMemoryOperationalDataStoreProviderModuleFactory
-        extends AbstractInMemoryOperationalDataStoreProviderModuleFactory {
-}

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang b/opendaylight/md-sal/sal-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang
deleted file mode 100644 (file)
index fe6ee32..0000000
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang
+++ /dev/null
@@ -1,105 +0,0 @@
-module opendaylight-inmemory-datastore-provider {
-
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider";
-    prefix "inmemory-datastore-provider";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-    import opendaylight-config-dom-datastore {prefix config-dom-store-spi;}
-    import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;}
-    import opendaylight-md-sal-dom {prefix sal;}
-
-    description
-        "InMemory datastore provider implementation for config & operational datastore";
-
-    revision "2014-06-17" {
-        description
-        "Initial revision.";
-    }
-
-    // This is the definition of the service implementation as a module identity.
-    identity inmemory-config-datastore-provider {
-            base config:module-type;
-            config:provided-service config-dom-store-spi:config-dom-datastore;
-            config:java-name-prefix InMemoryConfigDataStoreProvider;
-            status deprecated;
-    }
-
-        // This is the definition of the service implementation as a module identity.
-
-    identity inmemory-operational-datastore-provider {
-            base config:module-type;
-            config:provided-service operational-dom-store-spi:operational-dom-datastore;
-            config:java-name-prefix InMemoryOperationalDataStoreProvider;
-            status deprecated;
-    }
-
-    grouping datastore-configuration {
-            leaf max-data-change-executor-queue-size {
-                default 1000;
-                type uint16;
-                description "The maximum queue size for the data change notification executor.";
-            }
-
-            leaf max-data-change-executor-pool-size {
-                default 20;
-                type uint16;
-                description "The maximum thread pool size for the data change notification executor.";
-            }
-
-            leaf max-data-change-listener-queue-size {
-                default 1000;
-                type uint16;
-                description "The maximum queue size for the data change listeners.";
-            }
-            leaf max-data-store-executor-queue-size {
-                default 5000;
-                type uint16;
-                description "The maximum queue size for the data store executor.";
-            }
-            leaf debug-transactions {
-                type boolean;
-                default false;
-                description "Enable transaction lifecycle debugging.";
-            }
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case inmemory-config-datastore-provider {
-            when "/config:modules/config:module/config:type = 'inmemory-config-datastore-provider'";
-
-            container inmemory-config-datastore-provider {
-                container schema-service {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:schema-service;
-                        }
-                    }
-                }
-                uses datastore-configuration;
-            }
-        }
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case inmemory-operational-datastore-provider {
-            when "/config:modules/config:module/config:type = 'inmemory-operational-datastore-provider'";
-
-            container inmemory-operational-datastore-provider {
-                container schema-service {
-                    uses config:service-ref {
-                        refine type {
-                            mandatory false;
-                            config:required-identity sal:schema-service;
-                        }
-                    }
-                }
-                uses datastore-configuration;
-            }
-        }
-    }
-}

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 2bf8864e9b3b5ecb9851eacc6783e1bd125ef198..a4adb129af2919d22a2ffeef0c922f1e5a158484 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -57,10 +57,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-spi</artifactId>
         </dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-spi</artifactId>
         </dependency>

-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-dom-config</artifactId>
-        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-impl</artifactId>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
index be1ba6cf6e1c38c19fa7631cf6866b9613b2a929..75c2285dbabaf81898032724e07e61af500df272 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -18,6 +18,10 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-binding-api</artifactId>
         </dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-eos-binding-api</artifactId>
         </dependency>

+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>clustering-it-model</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller.samples</groupId>
             <artifactId>clustering-it-model</artifactId>