From 0c14c338ac0592d2e98aa269b42934e45242995e Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 11 Apr 2018 16:03:43 -0400 Subject: [PATCH] Remove message-bus CSS components Change-Id: Ic873ca1f230ca373b7bcb2fa06568f14e3e5ea1a Signed-off-by: Tom Pantelis --- .../mdsal/odl-message-bus-collector/pom.xml | 8 --- .../src/main/feature/feature.xml | 15 ----- opendaylight/md-sal/messagebus-config/pom.xml | 51 --------------- .../main/resources/initial/05-message-bus.xml | 33 ---------- .../app/impl/MessageBusAppImplModule.java | 63 ------------------- .../impl/MessageBusAppImplModuleFactory.java | 60 ------------------ .../src/main/yang/messagebus-app-impl.yang | 41 ------------ .../messagebus-event-source-registry.yang | 23 ------- opendaylight/md-sal/pom.xml | 1 - 9 files changed, 295 deletions(-) delete mode 100644 features/mdsal/odl-message-bus-collector/src/main/feature/feature.xml delete mode 100644 opendaylight/md-sal/messagebus-config/pom.xml delete mode 100644 opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml delete mode 100644 opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java delete mode 100644 opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModuleFactory.java delete mode 100644 opendaylight/md-sal/messagebus-impl/src/main/yang/messagebus-app-impl.yang delete mode 100644 opendaylight/md-sal/messagebus-spi/src/main/yang/messagebus-event-source-registry.yang diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index 77ee4d0e7a..58ceb2a2a9 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -67,13 +67,5 @@ org.opendaylight.controller messagebus-impl - - - org.opendaylight.controller - messagebus-config - ${project.version} - xml - config - diff --git a/features/mdsal/odl-message-bus-collector/src/main/feature/feature.xml b/features/mdsal/odl-message-bus-collector/src/main/feature/feature.xml deleted file mode 100644 index 3e4bb62915..0000000000 --- a/features/mdsal/odl-message-bus-collector/src/main/feature/feature.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - mvn:org.opendaylight.controller/messagebus-config/${project.version}/xml/config - - - diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml deleted file mode 100644 index 338f19ee6d..0000000000 --- a/opendaylight/md-sal/messagebus-config/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 3.1.0 - - - - org.opendaylight.controller - messagebus-config - 1.8.0-SNAPSHOT - jar - Configuration files for message-bus - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/05-message-bus.xml - xml - config - - - - - - - - - diff --git a/opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml b/opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml deleted file mode 100644 index e3bd8e578a..0000000000 --- a/opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - messagebus-app-impl - binding-impl:messagebus-app-impl - - - - - mb-esr:event-source-registry - - messagebus-app-impl - /modules/module[type='messagebus-app-impl'][name='messagebus-app-impl'] - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:messagebus:app:impl?module=messagebus-app-impl&revision=2015-02-03 - urn:opendaylight:params:xml:ns:yang:controller:messagebus:spi:eventsourceregistry?module=messagebus-event-source-registry&revision=2015-04-02 - - diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java deleted file mode 100644 index b870e14530..0000000000 --- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java +++ /dev/null @@ -1,63 +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.messagebus.app.impl; - -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.messagebus.spi.EventSource; -import org.opendaylight.controller.messagebus.spi.EventSourceRegistration; -import org.opendaylight.controller.messagebus.spi.EventSourceRegistry; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class MessageBusAppImplModule extends AbstractMessageBusAppImplModule { - private static final Logger LOG = LoggerFactory.getLogger(MessageBusAppImplModule.class); - - private BundleContext bundleContext; - - public BundleContext getBundleContext() { - return bundleContext; - } - - public void setBundleContext(final BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - public MessageBusAppImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public MessageBusAppImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, - final MessageBusAppImplModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public java.lang.AutoCloseable createInstance() { - final WaitingServiceTracker tracker = - WaitingServiceTracker.create(EventSourceRegistry.class, bundleContext); - final EventSourceRegistry service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - return new EventSourceRegistry() { - @Override - public void close() { - // We need to close the WaitingServiceTracker however we don't want to close the actual - // service instance because its life-cycle is controlled via blueprint. - tracker.close(); - } - - @Override - public EventSourceRegistration registerEventSource(T eventSource) { - return service.registerEventSource(eventSource); - } - }; - } -} diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModuleFactory.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModuleFactory.java deleted file mode 100644 index 3359bbea08..0000000000 --- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModuleFactory.java +++ /dev/null @@ -1,60 +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 - */ - -/* -* Generated file -* -* Generated from: yang module name: message-bus-app-impl yang module local name: messagebus-app-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Tue Feb 03 09:03:11 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.messagebus.app.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 -public class MessageBusAppImplModuleFactory extends AbstractMessageBusAppImplModuleFactory { - @Override - public Module createModule(String instanceName, - DependencyResolver dependencyResolver, - BundleContext bundleContext) { - - MessageBusAppImplModule module = - (MessageBusAppImplModule) super.createModule(instanceName, - dependencyResolver, - bundleContext); - - module.setBundleContext(bundleContext); - - return module; - } - - @Override - public Module createModule(String instanceName, - DependencyResolver dependencyResolver, - DynamicMBeanWithInstance old, - BundleContext bundleContext) - throws Exception { - - MessageBusAppImplModule module = - (MessageBusAppImplModule) super.createModule(instanceName, - dependencyResolver, - old, - bundleContext); - - module.setBundleContext(bundleContext); - - return module; - } - -} diff --git a/opendaylight/md-sal/messagebus-impl/src/main/yang/messagebus-app-impl.yang b/opendaylight/md-sal/messagebus-impl/src/main/yang/messagebus-app-impl.yang deleted file mode 100644 index ac897b3387..0000000000 --- a/opendaylight/md-sal/messagebus-impl/src/main/yang/messagebus-app-impl.yang +++ /dev/null @@ -1,41 +0,0 @@ -module messagebus-app-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:messagebus:app:impl"; - prefix "binding-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding {prefix sal;} - import opendaylight-md-sal-dom {prefix dom;} - import messagebus-event-source-registry {prefix esr;} - - description - "Service definition for Message Bus application implementation."; - - revision "2015-02-03" { - description "Second revision. Message Bus opensourcing"; - } - - identity messagebus-app-impl { - status deprecated; - base config:module-type; - config:provided-service esr:event-source-registry; - config:java-name-prefix MessageBusAppImpl; - } - - augment "/config:modules/config:module/config:configuration" { - case messagebus-app-impl { - when "/config:modules/config:module/config:type = 'messagebus-app-impl'"; - - container binding-broker { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity sal:binding-broker-osgi-registry; - } - } - } - - } - } - -} diff --git a/opendaylight/md-sal/messagebus-spi/src/main/yang/messagebus-event-source-registry.yang b/opendaylight/md-sal/messagebus-spi/src/main/yang/messagebus-event-source-registry.yang deleted file mode 100644 index 4843326aa7..0000000000 --- a/opendaylight/md-sal/messagebus-spi/src/main/yang/messagebus-event-source-registry.yang +++ /dev/null @@ -1,23 +0,0 @@ -module messagebus-event-source-registry { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:messagebus:spi:eventsourceregistry"; - prefix "mb-esr"; - - import config { prefix config; revision-date 2013-04-05; } - - description - "Event source registry service interface definition for MessageBus"; - - revision "2015-04-02" { - description - "Initial revision"; - } - - identity event-source-registry { - status deprecated; - base "config:service-type"; - config:java-class "org.opendaylight.controller.messagebus.spi.EventSourceRegistry"; - config:disable-osgi-service-registration; - } - -} diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 668d63446c..f74709af4e 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -80,7 +80,6 @@ messagebus-spi messagebus-impl messagebus-util - messagebus-config sal-binding-it -- 2.36.6