Remove inventory manager config yang and XML

Change-Id: I47b550deadd08e002fe4388f707f9cbfe3b3bb64
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

diff --git a/applications/inventory-manager/src/main/config/default-config.xml b/applications/inventory-manager/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 8fa1cc4..0000000
--- a/applications/inventory-manager/src/main/config/default-config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-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
-
-NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for
-       backwards compatibility. Runtime modifications are not honored.
--->
-<snapshot>
-  <required-capabilities>
-    <!--<capability>urn:opendaylight:params:xml:ns:yang:southbound:impl?module=southbound-impl&amp;revision=2015-01-05</capability>-->
-    <capability>urn:opendaylight:inventory?module=opendaylight-inventory&amp;revision=2013-08-19</capability>
-    <capability>urn:opendaylight:flow:inventory?module=flow-node-inventory&amp;revision=2013-08-19</capability>
-    <capability>urn:opendaylight:flow:types?module=opendaylight-flow-types&amp;revision=2013-10-26</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:controller:config:distributed-entity-ownership-service?module=distributed-entity-ownership-service&amp;revision=2015-08-10</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:inventory-manager:impl">prefix:inventory-manager-impl</type>
-          <name>inventory-manager-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-          <entity-ownership-service>
-            <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
-            <name>entity-ownership-service</name>
-          </entity-ownership-service>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModule.java b/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModule.java
deleted file mode 100644 (file)
index 60bf1fb..0000000
--- a/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.inventory.manager.impl.rev150530;
-
-import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class InventoryManagerImplModule extends AbstractInventoryManagerImplModule {
-    public InventoryManagerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InventoryManagerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.inventory.manager.impl.rev150530.InventoryManagerImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // InventoryActivator instance is created via blueprint so this in a no-op.
-        return NoopAutoCloseable.INSTANCE;
-    }
-}

diff --git a/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModuleFactory.java b/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModuleFactory.java
deleted file mode 100644 (file)
index b8fe5bc..0000000
--- a/applications/inventory-manager/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/inventory/manager/impl/rev150530/InventoryManagerImplModuleFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: inventory-manager-impl yang module local name: inventory-manager-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Sat May 30 18:52:44 PDT 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.inventory.manager.impl.rev150530;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class InventoryManagerImplModuleFactory extends AbstractInventoryManagerImplModuleFactory {
-
-}

diff --git a/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang b/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang
deleted file mode 100644 (file)
index d688915..0000000
--- a/applications/inventory-manager/src/main/yang/inventory-manager-impl.yang
+++ /dev/null
@@ -1,46 +0,0 @@
-module inventory-manager-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:inventory-manager:impl";
-    prefix "inventory-manager-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import opendaylight-entity-ownership-service { prefix eos; }
-
-    description
-        "Service definition for inventory manager";
-
-    revision "2015-05-30" {
-        description
-            "Initial revision";
-    }
-
-    identity inventory-manager-impl {
-        base config:module-type;
-        config:java-name-prefix InventoryManagerImpl;
-        status deprecated;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case inventory-manager-impl {
-            when "/config:modules/config:module/config:type = 'inventory-manager-impl'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-
-            container entity-ownership-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity eos:entity-ownership-service;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/features/pom.xml b/features/pom.xml
index 796afb19ca4f11fd54be9bc2f0b18aae1f4a4b30..0bdb22d20ffbb981778c70ef45a9d6436ccf0c99 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,6 @@
         <lldp.version>0.11.0-SNAPSHOT</lldp.version>
 
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.inventory.manager.configfile>40-inventory-manager.xml</config.inventory.manager.configfile>
         <restconf.version>1.4.0-SNAPSHOT</restconf.version>
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     </properties>
@@ -158,12 +157,6 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>inventory-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>inventory-manager</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>lldp-speaker</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index de81dd81ac70657e669efe36c3a3ad3e378a3d4f..ff07e73c1a4933104cb62eb05ac89a6b0e04c393 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -37,7 +37,6 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config-he/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.inventory.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/inventory-manager/{{VERSION}}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-He</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/configmsgspy</configfile>
     </feature>