From 18f1024f566bac772d42cec67bacfa6b90649ed6 Mon Sep 17 00:00:00 2001 From: Vaclav Demcak Date: Fri, 22 Jul 2016 14:11:44 +0200 Subject: [PATCH] Comment out mdsal-signleton-service in controller We'd like to have only one (DOM) ClusterSingletonServiceProvider in ODL. So we have to commented out all actual reference for CSS DOM API in controller and we'll able to clean MD-SAL CSS projects for DOM API and stay with common API only. So this patch has to be applay before https://git.opendaylight.org/gerrit/#/c/42294/ Change-Id: I110b4554e4713802b9c261de8b1fd793eabb012a Signed-off-by: Vaclav Demcak --- .../06-clustered-entity-ownership.xml.conf | 9 ++- opendaylight/md-sal/sal-dom-config/pom.xml | 2 +- ...ClusterSingletonServiceProviderModule.java | 65 ------------------- ...SingletonServiceProviderModuleFactory.java | 35 ---------- .../cluster-singleton-service-impl-cfg.yang | 22 +++---- .../cluster-singleton-service-spi-cfg.yang | 10 +-- 6 files changed, 24 insertions(+), 119 deletions(-) delete mode 100644 opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModule.java delete mode 100644 opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModuleFactory.java diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/06-clustered-entity-ownership.xml.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/06-clustered-entity-ownership.xml.conf index f6eabc43d4..7f693e275a 100644 --- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/06-clustered-entity-ownership.xml.conf +++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/06-clustered-entity-ownership.xml.conf @@ -15,11 +15,12 @@ legacy-eos:legacy-entity-ownership-service-provider legacy-entity-ownership-service-provider - + @@ -30,7 +31,7 @@ /modules/module[type='legacy-entity-ownership-service-provider'][name='legacy-entity-ownership-service-provider'] - + + urn:opendaylight:params:xml:ns:yang:controller:config:legacy-entity-ownership-service-provider?module=opendaylight-legacy-entity-ownership-service-provider&revision=2016-02-26 + diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml index 653fc4bc6e..24dd31736a 100644 --- a/opendaylight/md-sal/sal-dom-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-config/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal - mdsal-singleton-dom-api + mdsal-singleton-common-api diff --git a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModule.java b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModule.java deleted file mode 100644 index 72094daa29..0000000000 --- a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModule.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016 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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.md.sal.config.impl.cluster.singleton.service.rev160718; - -import com.google.common.reflect.AbstractInvocationHandler; -import com.google.common.reflect.Reflection; -import java.lang.reflect.Method; -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.mdsal.singleton.dom.api.DOMClusterSingletonServiceProvider; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users - * of the provided config system service are converted to blueprint. - */ -@Deprecated -public class DOMClusterSingletonServiceProviderModule extends AbstractDOMClusterSingletonServiceProviderModule { - private BundleContext bundleContext; - - public DOMClusterSingletonServiceProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public DOMClusterSingletonServiceProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver, - DOMClusterSingletonServiceProviderModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - - @Override - public AutoCloseable createInstance() { - final WaitingServiceTracker tracker = - WaitingServiceTracker.create(DOMClusterSingletonServiceProvider.class, bundleContext); - final DOMClusterSingletonServiceProvider service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - // Create a proxy to override close to close the ServiceTracker. The actual DOMClusterSingletonServiceProvider - // instance will be closed via blueprint. - return Reflection.newProxy(AutoCloseableDOMClusterSingletonServiceProvider.class, new AbstractInvocationHandler() { - @Override - protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable { - if (method.getName().equals("close")) { - tracker.close(); - return null; - } else { - return method.invoke(service, args); - } - } - }); - - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - private static interface AutoCloseableDOMClusterSingletonServiceProvider extends DOMClusterSingletonServiceProvider, AutoCloseable { - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModuleFactory.java b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModuleFactory.java deleted file mode 100644 index 3d1f5340e9..0000000000 --- a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/DOMClusterSingletonServiceProviderModuleFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016 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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.md.sal.config.impl.cluster.singleton.service.rev160718; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -/** - * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users - * of the provided config system service are converted to blueprint. - */ -@Deprecated -public class DOMClusterSingletonServiceProviderModuleFactory extends AbstractDOMClusterSingletonServiceProviderModuleFactory { - @Override - public DOMClusterSingletonServiceProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - DOMClusterSingletonServiceProviderModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - DOMClusterSingletonServiceProviderModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public DOMClusterSingletonServiceProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - DOMClusterSingletonServiceProviderModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-impl-cfg.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-impl-cfg.yang index 0084a43864..20c588c9ee 100644 --- a/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-impl-cfg.yang +++ b/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-impl-cfg.yang @@ -12,15 +12,15 @@ module cluster-singleton-service-impl { description "Initial revision"; } - identity dom-cluster-singleton-service-impl { - base config:module-type; - config:provided-service spi:dom-cluster-singleton-service; - config:java-name-prefix DOMClusterSingletonServiceProvider; - } - - augment "/config:modules/config:module/config:configuration" { - case dom-cluster-singleton-service-impl { - when "/config:modules/config:module/config:type = 'dom-cluster-singleton-service-impl'"; - } - } +// identity dom-cluster-singleton-service-impl { +// base config:module-type; +// config:provided-service spi:dom-cluster-singleton-service; +// config:java-name-prefix DOMClusterSingletonServiceProvider; +// } +// +// augment "/config:modules/config:module/config:configuration" { +// case dom-cluster-singleton-service-impl { +// when "/config:modules/config:module/config:type = 'dom-cluster-singleton-service-impl'"; +// } +// } } diff --git a/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-spi-cfg.yang b/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-spi-cfg.yang index bc5f7e5996..1d92534d9e 100644 --- a/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-spi-cfg.yang +++ b/opendaylight/md-sal/sal-dom-config/src/main/yang/cluster-singleton-service-spi-cfg.yang @@ -11,9 +11,9 @@ module cluster-singleton-service-spi { description "Initial revision"; } - identity dom-cluster-singleton-service { - base "config:service-type"; - config:java-class "org.opendaylight.mdsal.singleton.dom.api.DOMClusterSingletonServiceProvider"; - config:disable-osgi-service-registration; - } +// identity dom-cluster-singleton-service { +// base "config:service-type"; +// config:java-class "org.opendaylight.mdsal.singleton.dom.api.DOMClusterSingletonServiceProvider"; +// config:disable-osgi-service-registration; +// } } -- 2.36.6