From e514a5fc59ade7ac2ce5faf0ba5c75c3cb259c7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Tue, 23 Aug 2016 09:44:25 -0400 Subject: [PATCH] Remove deprecated CSS files - sal-remoterpc-connector MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I2d163486e15ca7eaededb45194645f24f00bfca2 Signed-off-by: Alexis de Talhouët --- features/mdsal/src/main/features/features.xml | 2 +- .../resources/initial/05-clustering.xml.conf | 15 ----- .../RemoteRPCBrokerModule.java | 38 ------------ .../RemoteRPCBrokerModuleFactory.java | 21 ------- .../src/main/yang/remote-rpc-connector.yang | 62 ------------------- 5 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModule.java delete mode 100644 opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModuleFactory.java delete mode 100644 opendaylight/md-sal/sal-remoterpc-connector/src/main/yang/remote-rpc-connector.yang diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml index 195954b2ba..e923f78579 100644 --- a/features/mdsal/src/main/features/features.xml +++ b/features/mdsal/src/main/features/features.xml @@ -98,7 +98,7 @@ odl-mdsal-remoterpc-connector odl-mdsal-distributed-datastore - mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config + mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/entityownershipconfig mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/akkaconf mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/factoryakkaconf 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 index 6a66efb54d..3ee5fe8ac0 100644 --- 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 @@ -69,21 +69,6 @@ - - prefix:remote-rpc-connector - remote-rpc-connector - - dom:dom-broker-osgi-registry - dom-broker - - - as:actor-system-provider-service - actor-system-provider - - true - 1000 - - prefix:cluster-admin-provider cluster-admin-provider diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModule.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModule.java deleted file mode 100644 index e4631f965d..0000000000 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModule.java +++ /dev/null @@ -1,38 +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.config.remote_rpc_connector; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -public class RemoteRPCBrokerModule extends org.opendaylight.controller.config.yang.config.remote_rpc_connector.AbstractRemoteRPCBrokerModule { - public RemoteRPCBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public RemoteRPCBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.remote_rpc_connector.RemoteRPCBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public boolean canReuseInstance(AbstractRemoteRPCBrokerModule oldModule) { - return true; - } - - @Override - public AutoCloseable createInstance() { - // The RemoteRpcProvider is created via blueprint and doesn't advertise any services so return a - // no-op here for backwards compatibility. - return NoopAutoCloseable.INSTANCE; - } -} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModuleFactory.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModuleFactory.java deleted file mode 100644 index dec35597fe..0000000000 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModuleFactory.java +++ /dev/null @@ -1,21 +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: remote-rpc-connector yang module local name: remote-rpc-connector -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon Jul 07 17:02:25 PDT 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.remote_rpc_connector; - -public class RemoteRPCBrokerModuleFactory extends AbstractRemoteRPCBrokerModuleFactory { -} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/yang/remote-rpc-connector.yang b/opendaylight/md-sal/sal-remoterpc-connector/src/main/yang/remote-rpc-connector.yang deleted file mode 100644 index 6f21929d78..0000000000 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/yang/remote-rpc-connector.yang +++ /dev/null @@ -1,62 +0,0 @@ -module remote-rpc-connector { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector"; - prefix "remote-rpc-connector"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-dom {prefix dom;} - import actor-system-provider-service {prefix actor-system;} - - description - "This module contains the base YANG definitions for - the remote routed rpc"; - - revision "2014-07-07" { - description - "Initial revision"; - } - - // This is the definition of the service implementation as a module identity. - identity remote-rpc-connector { - base config:module-type; - // Specifies the prefix for generated java classes. - config:java-name-prefix RemoteRPCBroker; - } - - augment "/config:modules/config:module/config:configuration" { - case remote-rpc-connector { - when "/config:modules/config:module/config:type = 'remote-rpc-connector'"; - - container dom-broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity dom:dom-broker-osgi-registry; - } - } - } - - container actor-system-provider { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity actor-system:actor-system-provider-service; - } - } - } - - leaf enable-metric-capture { - default false; - type boolean; - description "Enable or disable metric capture."; - } - - leaf bounded-mailbox-capacity { - default 1000; - type uint16; - description "Max queue size that an actor's mailbox can reach"; - } - } - } - -} \ No newline at end of file -- 2.36.6