Remove message-bus CSS components 05/70805/5
authorTom Pantelis <tompantelis@gmail.com>
Wed, 11 Apr 2018 20:03:43 +0000 (16:03 -0400)
committerRobert Varga <nite@hq.sk>
Thu, 19 Apr 2018 09:44:40 +0000 (09:44 +0000)
Change-Id: Ic873ca1f230ca373b7bcb2fa06568f14e3e5ea1a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
features/mdsal/odl-message-bus-collector/pom.xml
features/mdsal/odl-message-bus-collector/src/main/feature/feature.xml [deleted file]
opendaylight/md-sal/messagebus-config/pom.xml [deleted file]
opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml [deleted file]
opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java [deleted file]
opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModuleFactory.java [deleted file]
opendaylight/md-sal/messagebus-impl/src/main/yang/messagebus-app-impl.yang [deleted file]
opendaylight/md-sal/messagebus-spi/src/main/yang/messagebus-event-source-registry.yang [deleted file]
opendaylight/md-sal/pom.xml

index 77ee4d0..58ceb2a 100644 (file)
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>messagebus-impl</artifactId>
         </dependency>
-        <dependency>
-            <!-- finalname="${config.configfile.directory}/05-message-bus.xml" -->
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>messagebus-config</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
     </dependencies>
 </project>
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 (file)
index 3e4bb62..0000000
+++ /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-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-message-bus-collector" version="${project.version}">
-        <configfile finalname="${config.configfile.directory}/05-message-bus.xml">
-            mvn:org.opendaylight.controller/messagebus-config/${project.version}/xml/config
-        </configfile>
-    </feature>
-</features>
diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml
deleted file mode 100644 (file)
index 338f19e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
--->
-<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>messagebus-config</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <description>Configuration files for message-bus</description>
-
-  <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/05-message-bus.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
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 (file)
index e3bd8e5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
--->
-<snapshot>
-    <configuration>
-      <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-          <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-              <module>
-                  <name>messagebus-app-impl</name>
-                  <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:messagebus:app:impl">binding-impl:messagebus-app-impl</type>
-              </module>
-          </modules>
-          <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-              <service>
-                  <type xmlns:mb-esr="urn:opendaylight:params:xml:ns:yang:controller:messagebus:spi:eventsourceregistry">mb-esr:event-source-registry</type>
-                    <instance>
-                        <name>messagebus-app-impl</name>
-                        <provider>/modules/module[type='messagebus-app-impl'][name='messagebus-app-impl']</provider>
-                    </instance>
-              </service>
-          </services>
-      </data>
-  </configuration>
-  <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:messagebus:app:impl?module=messagebus-app-impl&amp;revision=2015-02-03</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:messagebus:spi:eventsourceregistry?module=messagebus-event-source-registry&amp;revision=2015-04-02</capability>
-  </required-capabilities>
-</snapshot>
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 (file)
index b870e14..0000000
+++ /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<EventSourceRegistry> 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 <T extends EventSource> EventSourceRegistration<T> 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 (file)
index 3359bbe..0000000
+++ /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 (file)
index ac897b3..0000000
+++ /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 (file)
index 4843326..0000000
+++ /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;
-     }
-
-}
index 668d634..f74709a 100644 (file)
@@ -80,7 +80,6 @@
     <module>messagebus-spi</module>
     <module>messagebus-impl</module>
     <module>messagebus-util</module>
-    <module>messagebus-config</module>
 
     <!-- PAX EXAM ITs -->
     <module>sal-binding-it</module>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.