Deprecate md-sal config modules

Marked the md-sal dom/binding config yang modules, 01-md-sal.xml and
associated Module classes as deprecated.

Change-Id: Icbc24a0622f8b83173f656f9fa11003f270eaef3
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

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
index 4e2a4fb4d73dfebcbe039abd1a9f8ac806436bfd..038f060de0317222c030a102058a3abd5995e45f 100644 (file)
--- 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
@@ -6,6 +6,9 @@
  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>
@@ -172,9 +175,6 @@
                         <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>
-                    <notification-queue-depth>65536</notification-queue-depth>
-                    <notification-queue-spin>0</notification-queue-spin>
-                    <notification-queue-park>0</notification-queue-park>
                 </module>
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-data-compatible-broker</type>

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
index 3dc2864a226ecd08f780e360dce6a21c47e4dc05..09e790e3b2cfc8674b7e9664d0a2e2401abf8822 100644 (file)
--- 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
@@ -8,10 +8,14 @@
 
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 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 Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingAsyncDataBrokerImplModule extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingAsyncDataBrokerImplModule {
 

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
index eb185dae7283a13dfe30ebf9be4e0481b24b40ad..bbdaf8b8d60059cd40401206013f6eeb96c80d7a 100644 (file)
--- 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
@@ -17,7 +17,10 @@
 */
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
-
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingAsyncDataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.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
index bae95ffb7c39d479fc1ea2dd4a5da4854153c5b6..71bd0017cf2f7e37109687a64351fcb72db119db 100644 (file)
--- 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
@@ -33,8 +33,9 @@ import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 
 /**
-*
-*/
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class BindingBrokerImplModule extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModule {
 

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
index 181b568cf51e898a807053dbe16ab353fdfab2de..c69e5810e9dd43c31a92af9e6740fdf41a47bd62 100644 (file)
--- 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
@@ -16,10 +16,10 @@
 */
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
-
 /**
-*
-*/
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.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
index 971153bc7bf80dcb7858e538619b268a36b5ab28..0a10a1d5f9bcfd43e5ce4b8c0e65da31f38d3593 100644 (file)
--- 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
@@ -14,6 +14,10 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
 import org.opendaylight.controller.sal.core.api.Broker;
 
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingNotificationAdapterModule extends AbstractBindingNotificationAdapterModule  {
     public BindingNotificationAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);

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
index 0a5cb914334036dab59ccc5bd41a09822f754d1a..e29fef54108389e45b181f36d96f3f03d4bc4585 100644 (file)
--- 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
@@ -6,6 +6,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
+
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingNotificationAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.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
index ebfd5c2219ce17e140bdca12872a33c1f153c671..4f91d5b5e8a371d97a20edcb798f04f037d9fe4f 100644 (file)
--- 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
@@ -14,6 +14,10 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.controller.sal.core.api.Broker;
 
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingNotificationPublishAdapterModule extends AbstractBindingNotificationPublishAdapterModule {
     public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);

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
index e9a3df6a5fc221fa94920c79d8eff298c9b1ef93..df8eace2138b364140abe08135e7babed94346eb 100644 (file)
--- 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
@@ -6,6 +6,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
+
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class BindingNotificationPublishAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingNotificationPublishAdapterModuleFactory {
 
 }

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java
index 5b5fb45fd9904eb80ece3e9de0faa56351f6f796..1dee6fd3c0fddeb8269eb05757134afc0b184cd6 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java
+++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java
@@ -7,11 +7,7 @@
  */
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
-
-
-/**
-*
-*/
+@Deprecated
 public class ForwardedCompatibleDataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractForwardedCompatibleDataBrokerImplModuleFactory
 {
 

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
index ec4bc76f554f3a8fb7bcff890fc1c047743b7057..46cb7ceee026c69ebb3e8ff40ba36a7e53516347 100644 (file)
--- 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
@@ -19,8 +19,9 @@ import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionLis
 import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder;
 
 /**
-*
-*/
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class NotificationBrokerImplModule extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModule {
 

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
index 5c5c062db685f47226056bdb5a8a64465ddf04e2..44d7609939f1e0565d31a752d40437f0d268f1a2 100644 (file)
--- 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
@@ -8,8 +8,9 @@
 package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
 /**
-*
-*/
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class NotificationBrokerImplModuleFactory extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModuleFactory {
 

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java
deleted file mode 100644 (file)
index 903475c..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
-*
-*/
-public final class RpcBrokerImplModule extends
-        org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRpcBrokerImplModule {
-
-    public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            RpcBrokerImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        // TODO:implement
-        throw new java.lang.UnsupportedOperationException("Unimplemented stub method");
-    }
-}

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java
deleted file mode 100644 (file)
index b624087..0000000
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.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.md.sal.binding.impl;
-
-/**
-*
-*/
-public class RpcBrokerImplModuleFactory extends
-        org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRpcBrokerImplModuleFactory {
-
-}

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
index f6b86ebcd14abb84bddadf56aada5774d22a200a..cc44cd84fb48c5c4f77deb85c3bf525a69882e07 100644 (file)
--- 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
@@ -16,8 +16,9 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo
 import org.osgi.framework.BundleContext;
 
 /**
- *
-**/
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class RuntimeMappingModule extends AbstractRuntimeMappingModule {
     private static final long WAIT_IN_MINUTES = 5;
 

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
index 407b41d29df1df9afcad7473ead9fd3a9dc464a6..c9195c7073a3df8fa2f67c4641da9e44117e6a3c 100644 (file)
--- 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
@@ -7,14 +7,14 @@
  */
 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;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
- *
+ * @deprecated Replaced by blueprint wiring
  */
+@Deprecated
 public class RuntimeMappingModuleFactory extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModuleFactory {
 

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
index a56e2f9e32d18ca67f85a0e40275eb541bc6c7ef..159f9f229eb1ae2bc11c21542dd15cda7e639f38 100644 (file)
--- 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
@@ -24,6 +24,7 @@ module opendaylight-sal-binding-broker-impl {
 
     /* 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;
@@ -31,12 +32,14 @@ module opendaylight-sal-binding-broker-impl {
 
     /* 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;
@@ -44,6 +47,7 @@ module opendaylight-sal-binding-broker-impl {
     }
 
     identity binding-data-compatible-broker {
+        status deprecated;
         base config:module-type;
         config:provided-service sal:binding-data-broker;
         config:provided-service sal:binding-data-consumer-broker;
@@ -51,18 +55,14 @@ module opendaylight-sal-binding-broker-impl {
     }
 
     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-rpc-broker {
-        base config:module-type;
-        config:provided-service sal:binding-rpc-registry;
-        config:java-name-prefix RpcBrokerImpl;
-    }
-
     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;
@@ -70,6 +70,7 @@ module opendaylight-sal-binding-broker-impl {
     }
 
     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;
@@ -78,18 +79,21 @@ module opendaylight-sal-binding-broker-impl {
     }
 
     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 {
@@ -126,6 +130,7 @@ module opendaylight-sal-binding-broker-impl {
                 uses dom-forwarding-component;
     
                 container data-broker {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory false;
@@ -135,6 +140,7 @@ module opendaylight-sal-binding-broker-impl {
                 }
     
                 container notification-service {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory false;
@@ -144,6 +150,7 @@ module opendaylight-sal-binding-broker-impl {
                 }
     
                 container root-data-broker {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory false;
@@ -153,6 +160,7 @@ module opendaylight-sal-binding-broker-impl {
                 }
 
                 container notification-publish-service {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory false;
@@ -173,6 +181,7 @@ module opendaylight-sal-binding-broker-impl {
 
             container binding-data-compatible-broker {
                 container data-broker {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory false;
@@ -189,6 +198,7 @@ module opendaylight-sal-binding-broker-impl {
             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;
@@ -198,6 +208,7 @@ module opendaylight-sal-binding-broker-impl {
                 }
 
                 container binding-mapping-service {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory true;
@@ -207,6 +218,7 @@ module opendaylight-sal-binding-broker-impl {
                 }
 
                 container schema-service {
+                    status deprecated;
                     uses config:service-ref {
                         refine type {
                             mandatory true;
@@ -223,23 +235,18 @@ module opendaylight-sal-binding-broker-impl {
         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:state" {
-        case binding-rpc-broker {
-            when "/config:modules/config:module/config:type = 'binding-rpc-broker'";
-            uses common:rpc-state;
-        }
-    }
-
     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 false;
@@ -249,6 +256,7 @@ module opendaylight-sal-binding-broker-impl {
             }
 
             container notification-publish-adapter {
+                status deprecated;
                 uses config:service-ref {
                     refine type {
                         mandatory false;
@@ -270,6 +278,7 @@ module opendaylight-sal-binding-broker-impl {
         case binding-notification-adapter {
             when "/config:modules/config:module/config:type = 'binding-notification-adapter'";
             container binding-notification-adapter {
+                status deprecated;
                 uses dom-forwarding-component;
             }
         }
@@ -279,6 +288,7 @@ module opendaylight-sal-binding-broker-impl {
         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-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
index 895d3d2e29ea0eb6a45b64b1e32735938944765a..e3d71fb9aaae78ad0f98f9ed1c51bc58dc63fd31 100644 (file)
--- 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
@@ -27,6 +27,10 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class DomBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModule{
     private static final Logger LOG = LoggerFactory.getLogger(DomBrokerImplModule.class);
 

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
index 52230180eb9a5b4d7d07a1b21d35b49977f28201..6c2b422035cfc231f1045b1742a2e1a1f91080fc 100644 (file)
--- 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
@@ -12,6 +12,10 @@ import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
 import org.opendaylight.controller.config.spi.Module;
 import org.osgi.framework.BundleContext;
 
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class DomBrokerImplModuleFactory extends
         org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModuleFactory {
 

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
index fffee73b9e8576ea6fccdb71e3ab554cd0e8966e..581a64565c9ca4e20541a78279faa5d9f8428bf5 100644 (file)
--- 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
@@ -25,8 +25,9 @@ import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExec
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 
 /**
-*
-*/
+ * @deprecated Replaced by the clustered data store.
+ */
+@Deprecated
 public final class DomInmemoryDataBrokerModule extends
         org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule {
 

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
index 56a51ed45e75588d40adca6b9613348e3e1c8d9a..0dc311cf323943ab7d17df48049e2f542f019f96 100644 (file)
--- 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
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.controller.config.yang.md.sal.dom.impl;
 
-
 /**
-*
-*/
+ * @deprecated Replaced by the clustered data store.
+ */
+@Deprecated
 public class DomInmemoryDataBrokerModuleFactory extends org.opendaylight.controller.config.yang.md.sal.dom.impl.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
index dae7f05cc66f513f0a0ca87abd2b6860c09a4c95..fb4043053beb72443db5a056b52e736d58c8727e 100644 (file)
--- 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
@@ -23,6 +23,10 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class SchemaServiceImplSingletonModule extends
 org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModule {
 

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
index 0908fe573bbf28ba4d285e046f13e14ce5ece55f..5cd753e676987c99f4f2c02670db3146c6d664d3 100644 (file)
--- 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
@@ -7,11 +7,14 @@
  */
 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;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
+/**
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public class SchemaServiceImplSingletonModuleFactory extends
         org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModuleFactory {
 

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
index 1664a3723dd2aed1ee634d3c9a958d0d346d9fc4..ffb0e19838b3604cd34e6cec7bc01fda1af430e3 100644 (file)
--- 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
@@ -11,6 +11,10 @@ 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 Replaced by blueprint wiring
+ */
+@Deprecated
 public class PingpongDataBrokerModule extends AbstractPingpongDataBrokerModule {
     public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);

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
index 8ec17fd6e933fe540d538a7c1f743c02214a1d4d..468abbd14183edf3724c0c17c7e354e0b9715843 100644 (file)
--- 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
@@ -7,6 +7,10 @@
  */
 package org.opendaylight.controller.config.yang.md.sal.dom.pingpong;
 
+/**
+ * @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
index 05d5b3e18643e5c19155d343cd0013e547eb90eb..5bda2d66c18d4f3a3d5f248e823f3405bd937e1e 100644 (file)
--- 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
@@ -23,6 +23,7 @@ module opendaylight-sal-dom-broker-impl {
     }
 
     identity dom-broker-impl {
+        status deprecated;
         base config:module-type;
         config:provided-service sal:dom-broker-osgi-registry;
         config:java-name-prefix DomBrokerImpl;
@@ -30,11 +31,13 @@ module opendaylight-sal-dom-broker-impl {
 
 
     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;
@@ -61,6 +64,7 @@ module opendaylight-sal-dom-broker-impl {
             }
 
             container root-schema-service {
+                status obsolete;
                 uses config:service-ref {
                     refine type {
                         mandatory false;
@@ -70,17 +74,20 @@ module opendaylight-sal-dom-broker-impl {
             }
 
             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;
@@ -90,6 +97,7 @@ module opendaylight-sal-dom-broker-impl {
     }
 
     grouping dom-broker-config {
+        status obsolete;
         container schema-service {
             uses config:service-ref {
                 refine type {
@@ -137,6 +145,7 @@ module opendaylight-sal-dom-broker-impl {
     }
 
     grouping dom-broker-operational {
+        status obsolete;
         leaf total-commits {
             type uint64;
         }