Move features

We want to flatten our structure, make sure we concentrate features
in the main directory.

Also eliminate odl-extras-all, as that is just an an aggregator for
jolokia.

Change-Id: I6b7d5a0a8c12e574500c410f6fd3829275f7034b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml
deleted file mode 100644 (file)
index b158af9..0000000
--- a/features/benchmark/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 Cisco Systems 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
--->
-<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.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-mdsal-benchmark-aggregator</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
-
-    <modules>
-        <module>features-mdsal-benchmark</module>
-        <module>odl-benchmark-api</module>
-        <module>odl-dsbenchmark</module>
-        <module>odl-mdsal-benchmark</module>
-        <module>odl-ntfbenchmark</module>
-    </modules>
-</project>

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
deleted file mode 100644 (file)
index b7a246c..0000000
--- a/features/config-netty/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<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.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-config-netty-aggregator</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-config-netty</module>
-        <module>odl-config-netty</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
-</project>

diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml
deleted file mode 100644 (file)
index cc7a5f9..0000000
--- a/features/extras/features-extras/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<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.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-extras</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-extras-all</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jolokia</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
deleted file mode 100644 (file)
index aff681a..0000000
--- a/features/extras/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<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.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-extras-aggregator</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-extras</module>
-        <module>odl-extras-all</module>
-        <module>odl-jolokia</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary</url>
-    </scm>
-</project>

diff --git a/features/config-netty/features-config-netty/pom.xml b/features/features-config-netty/pom.xml
similarity index 100%
rename from features/config-netty/features-config-netty/pom.xml
rename to features/features-config-netty/pom.xml

diff --git a/features/extras/odl-extras-all/pom.xml b/features/features-extras/pom.xml
similarity index 88%
rename from features/extras/odl-extras-all/pom.xml
rename to features/features-extras/pom.xml
index 79ef99ca499cb0202a4d3b782cc045093e5ffe27..208b18ce61d9cd30550c58c830f1544396b283ef 100644 (file)
--- a/features/extras/odl-extras-all/pom.xml
+++ b/features/features-extras/pom.xml
@@ -11,18 +11,16 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>feature-repo-parent</artifactId>
         <version>7.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-extras-all</artifactId>
+    <artifactId>features-extras</artifactId>
     <version>1.15.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Extras :: All</name>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -32,5 +30,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-
 </project>

diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/features-mdsal-benchmark/pom.xml
similarity index 100%
rename from features/benchmark/features-mdsal-benchmark/pom.xml
rename to features/features-mdsal-benchmark/pom.xml

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
similarity index 100%
rename from features/mdsal/features-mdsal/pom.xml
rename to features/features-mdsal/pom.xml

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
deleted file mode 100644 (file)
index 0660c33..0000000
--- a/features/mdsal/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- 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
- -->
-<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.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-mdsal-aggregator</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-mdsal</module>
-
-        <module>odl-clustering-test-app</module>
-        <module>odl-controller-mdsal-common</module>
-        <module>odl-mdsal-clustering-commons</module>
-        <module>odl-controller-blueprint</module>
-
-        <module>odl-mdsal-broker</module>
-        <module>odl-mdsal-broker-local</module>
-        <module>odl-mdsal-distributed-datastore</module>
-        <module>odl-mdsal-model-inventory</module>
-        <module>odl-controller-model-topology</module>
-        <module>odl-mdsal-remoterpc-connector</module>
-        <module>odl-message-bus-collector</module>
-        <module>odl-toaster</module>
-    </modules>
-
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
-</project>

diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/odl-benchmark-api/pom.xml
similarity index 100%
rename from features/benchmark/odl-benchmark-api/pom.xml
rename to features/odl-benchmark-api/pom.xml

diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/odl-clustering-test-app/pom.xml
similarity index 100%
rename from features/mdsal/odl-clustering-test-app/pom.xml
rename to features/odl-clustering-test-app/pom.xml

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/odl-config-netty/pom.xml
similarity index 100%
rename from features/config-netty/odl-config-netty/pom.xml
rename to features/odl-config-netty/pom.xml

diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/odl-config-netty/src/main/feature/feature.xml
similarity index 100%
rename from features/config-netty/odl-config-netty/src/main/feature/feature.xml
rename to features/odl-config-netty/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-controller-blueprint/pom.xml b/features/odl-controller-blueprint/pom.xml
similarity index 100%
rename from features/mdsal/odl-controller-blueprint/pom.xml
rename to features/odl-controller-blueprint/pom.xml

diff --git a/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
rename to features/odl-controller-blueprint/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/odl-controller-mdsal-common/pom.xml
similarity index 100%
rename from features/mdsal/odl-controller-mdsal-common/pom.xml
rename to features/odl-controller-mdsal-common/pom.xml

diff --git a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
rename to features/odl-controller-mdsal-common/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml
similarity index 100%
rename from features/mdsal/odl-controller-model-topology/pom.xml
rename to features/odl-controller-model-topology/pom.xml

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/odl-dsbenchmark/pom.xml
similarity index 100%
rename from features/benchmark/odl-dsbenchmark/pom.xml
rename to features/odl-dsbenchmark/pom.xml

diff --git a/features/extras/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
similarity index 100%
rename from features/extras/odl-jolokia/pom.xml
rename to features/odl-jolokia/pom.xml

diff --git a/features/extras/odl-jolokia/src/main/feature/feature.xml b/features/odl-jolokia/src/main/feature/feature.xml
similarity index 100%
rename from features/extras/odl-jolokia/src/main/feature/feature.xml
rename to features/odl-jolokia/src/main/feature/feature.xml

diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/odl-mdsal-benchmark/pom.xml
similarity index 100%
rename from features/benchmark/odl-mdsal-benchmark/pom.xml
rename to features/odl-mdsal-benchmark/pom.xml

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-broker-local/pom.xml
rename to features/odl-mdsal-broker-local/pom.xml

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/odl-mdsal-broker-local/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
rename to features/odl-mdsal-broker-local/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-broker/pom.xml
rename to features/odl-mdsal-broker/pom.xml

diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml
rename to features/odl-mdsal-broker/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-clustering-commons/pom.xml
rename to features/odl-mdsal-clustering-commons/pom.xml

diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
rename to features/odl-mdsal-clustering-commons/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/odl-mdsal-distributed-datastore/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-distributed-datastore/pom.xml
rename to features/odl-mdsal-distributed-datastore/pom.xml

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
rename to features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-model-inventory/pom.xml
rename to features/odl-mdsal-model-inventory/pom.xml

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/odl-mdsal-remoterpc-connector/pom.xml
similarity index 100%
rename from features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
rename to features/odl-mdsal-remoterpc-connector/pom.xml

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/odl-message-bus-collector/pom.xml
similarity index 100%
rename from features/mdsal/odl-message-bus-collector/pom.xml
rename to features/odl-message-bus-collector/pom.xml

diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/odl-ntfbenchmark/pom.xml
similarity index 100%
rename from features/benchmark/odl-ntfbenchmark/pom.xml
rename to features/odl-ntfbenchmark/pom.xml

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/odl-toaster/pom.xml
similarity index 100%
rename from features/mdsal/odl-toaster/pom.xml
rename to features/odl-toaster/pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 1f8eab25d76434d511fa6a6f218295f0a07dbe07..185b0263bd4ae4bf83b34184053ec752c011bf04 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,9 +26,30 @@
   </properties>
 
   <modules>
-    <module>config-netty</module>
-    <module>mdsal</module>
-    <module>extras</module>
-    <module>benchmark</module>
+    <!-- Single features, to be cleaned up -->
+    <module>odl-benchmark-api</module>
+    <module>odl-clustering-test-app</module>
+    <module>odl-config-netty</module>
+    <module>odl-controller-blueprint</module>
+    <module>odl-controller-mdsal-common</module>
+    <module>odl-controller-model-topology</module>
+    <module>odl-dsbenchmark</module>
+    <module>odl-jolokia</module>
+    <module>odl-mdsal-benchmark</module>
+    <module>odl-mdsal-broker-local</module>
+    <module>odl-mdsal-broker</module>
+    <module>odl-mdsal-clustering-commons</module>
+    <module>odl-mdsal-distributed-datastore</module>
+    <module>odl-mdsal-model-inventory</module>
+    <module>odl-mdsal-remoterpc-connector</module>
+    <module>odl-message-bus-collector</module>
+    <module>odl-ntfbenchmark</module>
+    <module>odl-toaster</module>
+
+    <!-- Repositories, to be cleaned up -->
+    <module>features-config-netty</module>
+    <module>features-extras</module>
+    <module>features-mdsal</module>
+    <module>features-mdsal-benchmark</module>
   </modules>
 </project>