Remove config subsystem remnants

The project no longer uses the CSS so remove unused/unneeded
remnants.

Change-Id: Ie6ef46edc3bc070c8a340aa295b4d003a61b5c75
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/cisco-xr-driver/pom.xml b/cisco-xr-driver/pom.xml
index 6e3facc5c5bcb046f695c115ddc59f754b600cb6..ac535aa3b0eed763fba56ecf7514b629e3391b64 100644 (file)
--- a/cisco-xr-driver/pom.xml
+++ b/cisco-xr-driver/pom.xml
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -43,6 +43,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         </plugins>
     </build>
 
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>1.7.0-SNAPSHOT</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -120,4 +132,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <artifactId>ietf-yang-types-20130715</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/cli/pom.xml b/cli/pom.xml
index 217d762f5ebbdfb7800ef76d0c51bfe5cc830722..0e61f6bd78728788e077833a0b309f79f8b3a335 100644 (file)
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <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">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.12.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-unimgr/pom.xml b/features/odl-unimgr/pom.xml
index f03fc756e1bfde862c2b5504a0e78daf0d63c6a8..11876d5d570361760fb8e7cd00a0cf4ef87c2b60 100755 (executable)
--- a/features/odl-unimgr/pom.xml
+++ b/features/odl-unimgr/pom.xml
@@ -33,7 +33,6 @@
     <netconf.version>1.4.0-SNAPSHOT</netconf.version>
     <genius.version>0.4.0-SNAPSHOT</genius.version>
     <l2switch.version>0.7.0-SNAPSHOT</l2switch.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <openflowplugin.version>0.6.0-SNAPSHOT</openflowplugin.version>
     <openflowjava.version>0.11.0-SNAPSHOT</openflowjava.version>
     <ovsdb.version>1.6.0-SNAPSHOT</ovsdb.version>
@@ -104,22 +103,5 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.unimgr</groupId>
-      <artifactId>unimgr-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
 </project>

diff --git a/features/odl-unimgr/src/main/feature/feature.xml b/features/odl-unimgr/src/main/feature/feature.xml
index ab2814332bdded08490929b2b079e66d18e1acd8..84ed90b72566367e3f62d9dec46552e4919254ad 100644 (file)
--- a/features/odl-unimgr/src/main/feature/feature.xml
+++ b/features/odl-unimgr/src/main/feature/feature.xml
@@ -8,8 +8,5 @@
  -->
 <features name="odl-unimgr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-unimgr" version="${project.version}">
-        <configfile finalname="${configfile.directory}/unimgr.xml">
-            mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}/xml/config
-        </configfile>
     </feature>
-</features>
\ No newline at end of file
+</features>

diff --git a/impl/pom.xml b/impl/pom.xml
index 4bf8710b1e3afe775f2faf1f2a64113ccb8d38e8..6a6278c20b6853eeb905551a364077907a8e98bb 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -66,6 +66,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         </plugins>
     </build>
 
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>1.7.0-SNAPSHOT</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -167,4 +179,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/impl/src/main/config/default-config.xml b/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index a9e2578..0000000
--- a/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 Cable Television Laboratories, Inc. 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 INTERNAL
--->
-<snapshot>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:unimgr:impl?module=unimgr-impl&amp;revision=2016-05-25</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</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:unimgr:impl">prefix:unimgr</type>
-                    <name>unimgr-default</name>
-                </module>
-            </modules>
-        </data>
-    </configuration>
-</snapshot>

diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModule.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModule.java
deleted file mode 100644 (file)
index fdf3c7c..0000000
--- a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev160525;
-
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.unimgr.api.IUnimgrConsoleProvider;
-import org.osgi.framework.BundleContext;
-
-public class UnimgrModule extends AbstractUnimgrModule {
-
-    private BundleContext ctx;
-
-    public UnimgrModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public UnimgrModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, UnimgrModule oldModule, AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final WaitingServiceTracker<IUnimgrConsoleProvider> tracker = WaitingServiceTracker.create(
-                IUnimgrConsoleProvider.class, ctx);
-        final IUnimgrConsoleProvider provider = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        return provider;
-    }
-
-    @Override
-    public boolean canReuseInstance(AbstractUnimgrModule oldModule) {
-        return true;
-    }
-
-    public void setBundleContext(BundleContext ctx) {
-        this.ctx = ctx;
-    }
-}

diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModuleFactory.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModuleFactory.java
deleted file mode 100644 (file)
index b51bb7f..0000000
--- a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev160525/UnimgrModuleFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: unimgr-impl yang module local name: unimgr
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 28 09:02:35 EDT 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.unimgr.impl.rev160525;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-public class UnimgrModuleFactory extends AbstractUnimgrModuleFactory {
-
-    @Override
-    public UnimgrModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, UnimgrModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) {
-        final UnimgrModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-
-    @Override
-    public UnimgrModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) {
-        final UnimgrModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}

diff --git a/impl/src/main/yang/unimgr-impl.yang b/impl/src/main/yang/unimgr-impl.yang
deleted file mode 100755 (executable)
index 82d9bd6..0000000
--- a/impl/src/main/yang/unimgr-impl.yang
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015 Cable Television Laboratories, Inc. 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 INTERNAL
- */
-module unimgr-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:unimgr:impl";
-    prefix "unimgr-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "Service definition for unimgr project";
-
-    revision "2016-05-25" {
-        description
-            "Updated revision.";
-    }
-
-    identity unimgr {
-        base config:module-type;
-        config:java-name-prefix Unimgr;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case unimgr {
-            when "/config:modules/config:module/config:type = 'unimgr'";
-        }
-    }
-}

diff --git a/it/src/test/java/org/opendaylight/unimgr/it/UnimgrIT.java b/it/src/test/java/org/opendaylight/unimgr/it/UnimgrIT.java
index ba833fcf3480118bb8d9d738f73e5e99b8b87b25..830565f4687aaae49657658cc78c461091421d69 100644 (file)
--- a/it/src/test/java/org/opendaylight/unimgr/it/UnimgrIT.java
+++ b/it/src/test/java/org/opendaylight/unimgr/it/UnimgrIT.java
@@ -92,16 +92,6 @@ public class UnimgrIT extends AbstractMdsalTestBase {
         Assert.assertNotNull("db should not be null", dataBroker);
     }
 
-    @Override
-    public String getModuleName() {
-        return "unimgr";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "unimgr-default";
-    }
-
     @Override
     public MavenUrlReference getFeatureRepo() {
         return maven()

diff --git a/netvirt/pom.xml b/netvirt/pom.xml
index b895e1ad03473788e73678eb457dfb8a2703f2d0..e148797df48bed004485e1c2a1340c70fa4dec0b 100644 (file)
--- a/netvirt/pom.xml
+++ b/netvirt/pom.xml
@@ -8,9 +8,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.12.0-SNAPSHOT</version>
     <relativePath />
   </parent>
 

diff --git a/ovs-driver/pom.xml b/ovs-driver/pom.xml
index 5958eeea276dab104f54d4c46124c6359c02cd08..9dbb55c6dcec20e324ff510b479ca8bf178c82d1 100644 (file)
--- a/ovs-driver/pom.xml
+++ b/ovs-driver/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -38,6 +38,18 @@
         </plugins>
     </build>
 
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>1.7.0-SNAPSHOT</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -110,4 +122,4 @@
             <version>${openflow.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/template-driver/pom.xml b/template-driver/pom.xml
index c2dd95f9b37c503a4d337b5d5de76297941e2c44..1aeb559de0748c561d3547a1605efa9931bdd532 100644 (file)
--- a/template-driver/pom.xml
+++ b/template-driver/pom.xml
@@ -12,9 +12,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -43,6 +43,18 @@
 
     <!-- dependencies -->
 
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>mdsal-artifacts</artifactId>
+          <version>1.7.0-SNAPSHOT</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -75,4 +87,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>