Remove deprecated CSS files - sal-remoterpc-connector 53/44553/3
authorAlexis de Talhouët <adetalhouet@inocybe.com>
Tue, 23 Aug 2016 13:44:25 +0000 (09:44 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Wed, 24 Aug 2016 01:49:17 +0000 (01:49 +0000)
Change-Id: I2d163486e15ca7eaededb45194645f24f00bfca2
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
features/mdsal/src/main/features/features.xml
opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModule.java [deleted file]
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/config/yang/config/remote_rpc_connector/RemoteRPCBrokerModuleFactory.java [deleted file]
opendaylight/md-sal/sal-remoterpc-connector/src/main/yang/remote-rpc-connector.yang [deleted file]

index 195954b..e923f78 100644 (file)
@@ -98,7 +98,7 @@
     <feature name ='odl-mdsal-broker' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-remoterpc-connector</feature>
         <feature version='${project.version}'>odl-mdsal-distributed-datastore</feature>
-        <configfile finalname="${config.configfile.directory}/${config.clustering.configfile}">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/${config.clustering.configfile}" override="true" >mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/config</configfile>
         <configfile finalname="${config.configfile.directory}/${config.clustered-entity-ownership.configfile}">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/entityownershipconfig</configfile>
         <configfile finalname="configuration/initial/akka.conf">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/akkaconf</configfile>
         <configfile finalname="configuration/factory/akka.conf" override="true">mvn:org.opendaylight.controller/sal-clustering-config/{{VERSION}}/xml/factoryakkaconf</configfile>
index 6a66efb..3ee5fe8 100644 (file)
                     </config-properties>
                 </module>
 
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">prefix:remote-rpc-connector</type>
-                    <name>remote-rpc-connector</name>
-                    <dom-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">
-                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                        <name>dom-broker</name>
-                    </dom-broker>
-                    <actor-system-provider>
-                        <type xmlns:as="urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service">as:actor-system-provider-service</type>
-                        <name>actor-system-provider</name>
-                    </actor-system-provider>
-                    <enable-metric-capture xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">true</enable-metric-capture>
-                    <bounded-mailbox-capacity xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:remote-rpc-connector">1000</bounded-mailbox-capacity>
-                </module>
-
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:cluster-admin-provider">prefix:cluster-admin-provider</type>
                     <name>cluster-admin-provider</name>
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 (file)
index e4631f9..0000000
+++ /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 (file)
index dec3559..0000000
+++ /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 (file)
index 6f21929..0000000
+++ /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