From 2c84b87dbaf1112f264ce49d7903cb0748273603 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 3 May 2016 02:05:26 -0400 Subject: [PATCH] Remove CSS-related files from the clustering-test-app The clustering-test-app is wired with blueprint and, since it's a sample/test app, it doesn't need to maintain backwards compatibility with CSS so remove the CSS-related files. Change-Id: I0f186d8f143d171a1b6f55f36ce5ab74b14fa8cf Signed-off-by: Tom Pantelis --- features/mdsal/pom.xml | 7 -- features/mdsal/src/main/features/features.xml | 1 - .../clustering-test-app/configuration/pom.xml | 5 -- .../initial/20-clustering-test-app.xml | 53 -------------- .../clustering-test-app/provider/pom.xml | 56 --------------- .../ClusteringItProviderModule.java | 33 --------- .../ClusteringItProviderModuleFactory.java | 21 ------ .../src/main/yang/clustering-it-provider.yang | 70 ------------------- 8 files changed, 246 deletions(-) delete mode 100644 opendaylight/md-sal/samples/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml delete mode 100644 opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java delete mode 100644 opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java delete mode 100644 opendaylight/md-sal/samples/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 8ac07c2c54..fa956000a4 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -306,13 +306,6 @@ model-inventory - - org.opendaylight.controller.samples - clustering-it-config - ${controller.mdsal.version} - xml - config - org.opendaylight.controller.samples clustering-it-config diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml index 7faae7ecdc..94df44bc13 100644 --- a/features/mdsal/src/main/features/features.xml +++ b/features/mdsal/src/main/features/features.xml @@ -109,7 +109,6 @@ odl-mdsal-broker mvn:org.opendaylight.controller.samples/clustering-it-model/{{VERSION}} mvn:org.opendaylight.controller.samples/clustering-it-provider/{{VERSION}} - mvn:org.opendaylight.controller.samples/clustering-it-config/{{VERSION}}/xml/config diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index f11a528c90..56c97437b7 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -30,11 +30,6 @@ package - - ${project.build.directory}/classes/initial/20-clustering-test-app.xml - xml - config - ${project.build.directory}/classes/initial/module-shards.conf xml diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml deleted file mode 100644 index dc479efebc..0000000000 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - prefix:clustering-it-provider - - clustering-it-provider - - - binding:binding-rpc-registry - binding-rpc-broker - - - binding:binding-async-data-broker - binding-data-broker - - - - binding:binding-notification-service - - binding-notification-broker - - - - ns:entity-ownership-service - - entity-ownership-service - - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:config:clustering-it-provider?module=clustering-it-provider&revision=2014-08-19 - urn:opendaylight:params:xml:ns:yang:controller:config:distributed-entity-ownership-service?module=distributed-entity-ownership-service&revision=2015-08-10 - - - - diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml index c14482f6cc..ec0dd4a955 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml @@ -15,55 +15,7 @@ org.apache.felix maven-bundle-plugin - ${bundle.plugin.version} true - - - org.opendaylight.controller.config.yang.config.clustering_it_provider - * - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - config - - generate-sources - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - true - - - - - - org.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - - @@ -74,20 +26,13 @@ clustering-it-model ${project.version} - - org.opendaylight.controller - config-api - ${config.version} - org.opendaylight.controller sal-binding-config - ${mdsal.version} org.opendaylight.controller sal-binding-api - ${mdsal.version} org.opendaylight.controller @@ -96,7 +41,6 @@ org.opendaylight.controller sal-common-util - ${mdsal.version} org.eclipse.tycho diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java deleted file mode 100644 index 926054d325..0000000000 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2014 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.clustering_it_provider; - - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -public class ClusteringItProviderModule extends org.opendaylight.controller.config.yang.config.clustering_it_provider.AbstractClusteringItProviderModule { - public ClusteringItProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public ClusteringItProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.clustering_it_provider.ClusteringItProviderModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public AutoCloseable createInstance() { - // The components are created and wired via blueprint so return an empty AutoCloseable. - return NoopAutoCloseable.INSTANCE; - } -} diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java deleted file mode 100644 index efdd4c6a94..0000000000 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2014 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: clustering-it-provider yang module local name: clustering-it-provider -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Tue Aug 19 14:44:46 PDT 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.clustering_it_provider; -public class ClusteringItProviderModuleFactory extends org.opendaylight.controller.config.yang.config.clustering_it_provider.AbstractClusteringItProviderModuleFactory { - -} diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang deleted file mode 100644 index 8a802d37e9..0000000000 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang +++ /dev/null @@ -1,70 +0,0 @@ -module clustering-it-provider { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:clustering-it-provider"; - prefix "clustering-it-provider"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import opendaylight-entity-ownership-service { prefix entity-ownership-service; } - - description - "This module contains the base YANG definitions for - clustering-it-provider implementation."; - - revision "2014-08-19" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity. - identity clustering-it-provider { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix ClusteringItProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case clustering-it-provider { - when "/config:modules/config:module/config:type = 'clustering-it-provider'"; - - container rpc-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - - container notification-service { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-notification-service; - } - } - } - - container data-broker { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - - container ownership-service { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity entity-ownership-service:entity-ownership-service; - } - } - } - } - } -} -- 2.36.6