Remove CSS artifact remnants

The project has already been converted to blueprint (except for test-extension)
so removed he remaining CSS remnants (eg use of config-parent, JMXGenerator).

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

diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml
index e9be3fec87632d35cbdfbbb2738ab1bfa3c7b858..fbb31689995f1f6a6ce6ff2c60eb73b5720ce48e 100644 (file)
--- a/applications/bulk-o-matic/pom.xml
+++ b/applications/bulk-o-matic/pom.xml
@@ -20,10 +20,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index d8b4dba8d13f8ea3d386684e36ea32bfab3f2ed4..2a45fa48e0569301dddf8989305e35cc6fedfb48 100644 (file)
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -15,10 +15,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>

diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml
index e9b2e0a0c196d84846a4316f23fbfe7cb06c9a49..1e835fdd27b75913e732417b87128248fdb70528 100644 (file)
--- a/applications/forwardingrules-sync/pom.xml
+++ b/applications/forwardingrules-sync/pom.xml
@@ -16,11 +16,6 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-api</artifactId>

diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml
index b16f4a705f3c5f0d0d20f9995a6dca795390eb27..fbe213b6f5b8e37cb8b852cb59ca1d14e9e24ef4 100644 (file)
--- a/applications/lldp-speaker/pom.xml
+++ b/applications/lldp-speaker/pom.xml
@@ -20,10 +20,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
@@ -40,10 +36,6 @@
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>liblldp</artifactId>

diff --git a/applications/notification-supplier/pom.xml b/applications/notification-supplier/pom.xml
index 71eac6418570d698d3621896a8e9c7b9cc8bd0ba..c0bc2adf48d112cab2479a74a885bd75b1378c72 100644 (file)
--- a/applications/notification-supplier/pom.xml
+++ b/applications/notification-supplier/pom.xml
@@ -20,10 +20,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index ae51344243920124b8ac0f2164c19b5c7cf196df..1340faabd157c11e8bf596da73ce2ee4a4705fe3 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -20,10 +20,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/applications/pom.xml b/applications/pom.xml
index a911fa42df37633be88484be546b6d10e7d06691..63e8588e127d77c0b61950d3a1ebeff4b79c0bd1 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -27,20 +27,6 @@
                             </goals>
                             <configuration>
                                 <codeGenerators>
-                                    <generator>
-                                        <codeGeneratorClass>
-                                            org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                        </codeGeneratorClass>
-                                        <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                        <additionalConfiguration>
-                                            <namespaceToPackage1>
-                                                urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                            </namespaceToPackage1>
-                                            <namespaceToPackage2>
-                                                urn:opendaylight:params:xml:ns:yang:openflowplugin:app==org.opendaylight.openflowplugin.applications.config.yang
-                                            </namespaceToPackage2>
-                                        </additionalConfiguration>
-                                    </generator>
                                     <generator>
                                         <codeGeneratorClass>
                                             org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
@@ -53,11 +39,6 @@
                         </execution>
                     </executions>
                     <dependencies>
-                        <dependency>
-                            <groupId>org.opendaylight.controller</groupId>
-                            <artifactId>yang-jmx-generator-plugin</artifactId>
-                            <version>${config.version}</version>
-                        </dependency>
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>

diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index d7d48ce94f23f9776a9cf5b9f5421ef186521fce..0f02ac7747b183897067aa048bf60728a9d540d1 100644 (file)
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -24,10 +24,6 @@
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-api</artifactId>
       </dependency>
-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-config</artifactId>
-      </dependency>
       <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index fdb74661829a7a9fdfbc17926a6d1f27780e3c5b..07241963f9fcc296a0708683e4e1492dafe9ce72 100644 (file)
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -2,9 +2,9 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <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>
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -21,6 +21,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <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>
 
@@ -41,10 +48,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>liblldp</artifactId>

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index 22def068155d62269170b6068fe8ef7154da264d..4f74af6544efab58c330392391aefce9d4e1d54c 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -2,9 +2,9 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <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>
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -21,6 +21,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <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>
 
@@ -33,10 +40,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-util</artifactId>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 03c22843a978f2930b82a3c5e8708db30f190e34..fa61e501adbd3893a0ba42b88b3a86e4d9197abc 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -26,10 +26,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
index b6ece06edc1a4a24e20e6bd86f570893f881cf16..8d07a0442119235ce3ae269d80ff9c601378ae03 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/src/main/features/features.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="openflowplugin-extension-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-openflowplugin-nxm-extensions" version="${project.version}">
-        <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira-config/${project.version}/xml/config</configfile>
     </feature>
-</features>
\ No newline at end of file
+</features>

diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index 9d40f9911a8e97e647cd59312c873c3a22c7e5bf..c836c9d2b3848f06d0f7ea262863d143cf874941 100644 (file)
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -44,11 +44,6 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
@@ -92,10 +87,6 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml
index f8543c1d78a3091b017ca49aafc43de0e6e20571..81308e9e945cd6b778b398f8522a0dd3b31af7e9 100644 (file)
--- a/extension/openflowplugin-extension-api/pom.xml
+++ b/extension/openflowplugin-extension-api/pom.xml
@@ -29,17 +29,6 @@
                         </goals>
                         <configuration>
                             <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller:config==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
                                 <generator>
                                     <codeGeneratorClass>
                                         org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
@@ -56,11 +45,6 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
@@ -101,10 +85,6 @@
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
 
         <!-- junit -->
         <dependency>

diff --git a/extension/openflowplugin-extension-api/src/main/yang/openflowplugin-extension-registry.yang b/extension/openflowplugin-extension-api/src/main/yang/openflowplugin-extension-registry.yang
deleted file mode 100644 (file)
index baa372f..0000000
--- a/extension/openflowplugin-extension-api/src/main/yang/openflowplugin-extension-registry.yang
+++ /dev/null
@@ -1,20 +0,0 @@
-module openflowplugin-extension-registry {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:openflowplugin:extension:api";
-    prefix "ofplugin-ext-registry";
-
-    import config {prefix config; revision-date 2013-04-05; }
-
-    description
-        "openflow-plugin extension registry provider point";
-
-    revision "2015-04-25" {
-        description
-            "Initial revision";
-    }
-
-    identity openflow-extension-registry-provider {
-        base config:service-type;
-        config:java-class "org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider";
-    }
-}
\ No newline at end of file

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index bbfd5d256f6bc7eb03263c9912b239958c8aa9db..554654a178300b5a28ef1379faa5104489572e21 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -45,11 +45,6 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index 96be8ea88877f23f52fddde29e74d25f53ef0cde..8d75e53413b8e47cc6be7d94f248c15ab5dde079 100644 (file)
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -9,16 +9,16 @@
     <relativePath>../</relativePath>
   </parent>
   <artifactId>test-extension</artifactId>
-  
+
   <packaging>bundle</packaging>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
@@ -29,17 +29,6 @@
                         </goals>
                         <configuration>
                             <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
                                 <generator>
                                     <codeGeneratorClass>
                                         org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
@@ -56,11 +45,6 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
@@ -71,7 +55,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
@@ -115,6 +99,6 @@
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
     </dependencies>
-    
-    
+
+
 </project>

diff --git a/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModule.java b/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModule.java
deleted file mode 100644 (file)
index 1fdb79c..0000000
--- a/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModule.java
+++ /dev/null
@@ -1,47 +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.test_provider.impl;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.openflowplugin.extension.test.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev130819.TestService;
-
-public class TestProviderModule extends org.opendaylight.controller.config.yang.config.test_provider.impl.AbstractTestProviderModule {
-    public TestProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public TestProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.test_provider.impl.TestProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        Test extTest = new Test();
-        SalFlowService flowService = getRpcRegistryDependency().getRpcService(SalFlowService.class);
-        extTest.setFlowService(flowService);
-
-        final RpcRegistration<TestService> registry = getRpcRegistryDependency().addRpcImplementation(TestService.class, extTest);
-
-        return new AutoCloseable() {
-
-            @Override
-            public void close() throws Exception {
-                registry.close();
-            }
-        };
-    }
-
-}

diff --git a/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModuleFactory.java b/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModuleFactory.java
deleted file mode 100644 (file)
index deb8da7..0000000
--- a/extension/test-extension/src/main/java/org/opendaylight/controller/config/yang/config/test_provider/impl/TestProviderModuleFactory.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: test-provider-impl yang module local name: test-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Jul 24 21:33:31 CEST 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.controller.config.yang.config.test_provider.impl;
-public class TestProviderModuleFactory extends org.opendaylight.controller.config.yang.config.test_provider.impl.AbstractTestProviderModuleFactory {
-
-}

diff --git a/extension/test-extension/src/main/resources/initial/75-test.xml b/extension/test-extension/src/main/resources/initial/75-test.xml
deleted file mode 100644 (file)
index f9e2885..0000000
--- a/extension/test-extension/src/main/resources/initial/75-test.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- vi: set et smarttab sw=4 tabstop=4: -->\r
-<!--\r
- Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
-\r
- This program and the accompanying materials are made available under the\r
- terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- and is available at http://www.eclipse.org/legal/epl-v10.html\r
--->\r
-<snapshot>\r
-    <configuration>\r
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">\r
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">\r
-                <module>\r
-                    <type xmlns:test="urn:opendaylight:params:xml:ns:yang:controller:config:test-provider:impl">\r
-                        test:test-provider-impl\r
-                    </type>\r
-                    <name>test-provider-impl</name>\r
-\r
-                    <rpc-registry>\r
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>\r
-                        <name>binding-rpc-broker</name>\r
-                    </rpc-registry>\r
-\r
-            <data-broker>\r
-                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>\r
-                      <name>binding-data-broker</name>\r
-                    </data-broker>\r
-                </module>\r
-        </modules>\r
-        </data>\r
-\r
-    </configuration>\r
-\r
-    <required-capabilities>\r
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:test-provider:impl?module=test-provider-impl&amp;revision=2014-06-11</capability>\r
-    </required-capabilities>\r
-\r
-</snapshot>\r
-\r

diff --git a/extension/test-extension/src/main/resources/org/opendaylight/blueprint/test-extension.xml b/extension/test-extension/src/main/resources/org/opendaylight/blueprint/test-extension.xml
new file mode 100644 (file)
index 0000000..0b2b93c
--- /dev/null
+++ b/extension/test-extension/src/main/resources/org/opendaylight/blueprint/test-extension.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+
+  <odl:rpc-service id="salFlowService"
+      interface="org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService"/>
+
+  <bean id="test" class="org.opendaylight.openflowplugin.extension.test.Test">
+    <property name="flowService" ref="salFlowService"/>
+  </bean>
+
+  <odl:rpc-implementation ref="test"/>
+
+</blueprint>

diff --git a/extension/test-extension/src/main/yang/test-provider-impl.yang b/extension/test-extension/src/main/yang/test-provider-impl.yang
deleted file mode 100644 (file)
index ebb557e..0000000
--- a/extension/test-extension/src/main/yang/test-provider-impl.yang
+++ /dev/null
@@ -1,53 +0,0 @@
-/*\r
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-\r
-module test-provider-impl {\r
-    yang-version 1;\r
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:test-provider:impl";\r
-    prefix "test-provider-impl";\r
-\r
-    import config { prefix config; revision-date 2013-04-05; }\r
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }\r
-\r
-    revision "2014-06-11" {\r
-        description\r
-            "Initial revision.";\r
-    }\r
-\r
-    identity test-provider-impl {\r
-        base "config:module-type";\r
-\r
-        config:java-name-prefix TestProvider;\r
-    }\r
-\r
-    // Augments the 'configuration' choice node under modules/module.  \r
-    augment "/config:modules/config:module/config:configuration" {\r
-        case test-provider-impl {\r
-            when "/config:modules/config:module/config:type = 'test-provider-impl'";\r
-\r
-            //wires in the data-broker service \r
-            container data-broker {\r
-                uses config:service-ref {\r
-                    refine type {\r
-                        mandatory true;\r
-                        config:required-identity mdsal:binding-async-data-broker;\r
-                    }\r
-                }\r
-            }\r
-            // RPC Registry\r
-            container rpc-registry {\r
-                uses config:service-ref {\r
-                    refine type {\r
-                        mandatory true;\r
-                        config:required-identity mdsal:binding-rpc-registry;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-}\r

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 1193cf8ea265505a1593d0623feebef7cc10041c..5f3d22fa4189420be039f498d1bb923e68e8e8dc 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -21,7 +21,6 @@
     <name>ODL :: openflowjava :: ${project.artifactId}</name>
 
     <properties>
-        <config.version>0.8.0-SNAPSHOT</config.version>
         <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
         <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
@@ -67,13 +66,6 @@
             </dependency>
 
             <!-- Controller infrastructure -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -98,12 +90,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-api</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-common</artifactId>

diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml
index 2e2176d37960018b227bb3ea8680bf1aacda36b9..e65e737b066a88700844c50e5ba3d4831222fbe0 100644 (file)
--- a/openflowjava/openflow-protocol-impl/pom.xml
+++ b/openflowjava/openflow-protocol-impl/pom.xml
@@ -131,10 +131,6 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>

diff --git a/openflowjava/openflow-protocol-spi/pom.xml b/openflowjava/openflow-protocol-spi/pom.xml
index 98063cfffbe642b6c6c41c7dae57f40933aeaf52..70d0fa947fca6a7c2dcd43f12dc95f437dc8b649 100644 (file)
--- a/openflowjava/openflow-protocol-spi/pom.xml
+++ b/openflowjava/openflow-protocol-spi/pom.xml
@@ -71,9 +71,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>openflow-protocol-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/openflowjava/pom.xml b/openflowjava/pom.xml
index 94bcca7cea7e6c336160e8d200e5d3474db76fc4..cd9f56bd6800ddc1098354002730b0e0d404e70c 100644 (file)
--- a/openflowjava/pom.xml
+++ b/openflowjava/pom.xml
@@ -63,7 +63,6 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${jmxGeneratorPath}</source>
                                 <source>${salGeneratorPath}</source>
                             </sources>
                         </configuration>
@@ -156,4 +155,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 2b54f136a3cd4095b0fc590b841a737c249e2cc6..9ad55925cd8b01a3644229163d52edee63b29cc9 100644 (file)
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -34,17 +34,6 @@
                         </goals>
                         <configuration>
                             <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
                                 <generator>
                                     <codeGeneratorClass>
                                         org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
@@ -61,11 +50,6 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

diff --git a/openflowplugin-api/src/main/yang/openflow-provider.yang b/openflowplugin-api/src/main/yang/openflow-provider.yang
deleted file mode 100644 (file)
index cb020ef..0000000
--- a/openflowplugin-api/src/main/yang/openflow-provider.yang
+++ /dev/null
@@ -1,22 +0,0 @@
-module openflow-provider {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:openflow:api";
-    prefix "ofplugin-cfg";
-
-    import config {prefix config; revision-date 2013-04-05; }
-
-    description
-        "openflow-plugin-custom-config";
-
-    revision "2015-03-31" {
-        description
-            "Initial revision";
-    }
-
-    identity openflow-provider{
-        base config:service-type;
-        config:java-class "org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider";
-        config:disable-osgi-service-registration;
-        status deprecated;
-    }
-}
\ No newline at end of file

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 5f1435c353a6aad552ce78b754a8b41954364d01..157ebc70f5c5a9956939a73b4067b9a2800423b0 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -63,10 +63,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
@@ -79,10 +75,6 @@
             <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 2529192c96fe3ba742dd4cfb6cafc80e2b32e871..7367d57f2a3a1b95df224ccd13b9e0de77bb3283 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -152,21 +152,6 @@
           <artifactId>org.eclipse.equinox.console</artifactId>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-impl</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-file-xml-adapter</artifactId>
-          <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>openexi</groupId>
@@ -195,11 +180,6 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>forwardingrules-manager</artifactId>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index ea49417e39dbf3668a755c969798cd22a0fb7a1e..23a3a63f92c9ebe36e36b9c5bef481ba1e5911c8 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -48,10 +48,6 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
@@ -65,10 +61,6 @@
             <groupId>${project.groupId}.openflowjava</groupId>
             <artifactId>openflow-protocol-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 777ecd80ac0b4ae97f5153fac0825ecd355d1a55..81d18bc9f294be65e4e3ba41d4aa507834faa340 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -32,10 +32,8 @@
     <properties>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
         <sal.api.version>0.14.0-SNAPSHOT</sal.api.version>
-        <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
         <controller.distribution.version>0.7.0-SNAPSHOT</controller.distribution.version>
-        <config.version>0.8.0-SNAPSHOT</config.version>
         <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
         <yangtools.version>2.0.0-SNAPSHOT</yangtools.version>
@@ -73,13 +71,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
@@ -124,12 +115,6 @@
                     <artifactId>maven-clean-plugin</artifactId>
                     <configuration>
                         <filesets>
-                            <fileset>
-                                <directory>${jmxGeneratorPath}</directory>
-                                <includes>
-                                    <include>**</include>
-                                </includes>
-                            </fileset>
                             <fileset>
                                 <directory>${salGeneratorPath}</directory>
                                 <includes>
@@ -151,7 +136,6 @@
                             </goals>
                             <configuration>
                                 <sources>
-                                    <source>${jmxGeneratorPath}</source>
                                     <source>${salGeneratorPath}</source>
                                 </sources>
                             </configuration>