From bdf8110b46840ba4c0fe0b95f8569c13c53d6101 Mon Sep 17 00:00:00 2001
From: melserngawy <melserngawy@inocybe.com>
Date: Fri, 9 Sep 2016 16:52:41 -0400
Subject: [PATCH] Re-organize the features module

Combine the api and authz feature modules with the authn feature module

Change-Id: Iafe456adb52dbecedaa56f38c829383b7d3817f2
Signed-off-by: melserngawy <melserngawy@inocybe.com>
---
 artifacts/pom.xml                             |  15 ---
 features/api/pom.xml                          |  91 ---------------
 features/api/src/main/features/features.xml   |  21 ----
 features/authn/pom.xml                        |  26 ++++-
 features/authn/src/main/features/features.xml |  30 ++++-
 features/authz/pom.xml                        | 110 ------------------
 features/authz/src/main/features/features.xml |  31 -----
 features/pom.xml                              |   2 -
 karaf/pom.xml                                 |  14 ---
 pom.xml                                       |   8 +-
 10 files changed, 55 insertions(+), 293 deletions(-)
 delete mode 100644 features/api/pom.xml
 delete mode 100644 features/api/src/main/features/features.xml
 delete mode 100644 features/authz/pom.xml
 delete mode 100644 features/authz/src/main/features/features.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a0e703f95..8d12c70e6 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -154,14 +154,6 @@
                 <artifactId>aaa-authn-idpmapping</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-aaa-api</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-aaa-authn</artifactId>
@@ -169,13 +161,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-aaa-authz</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>aaa-h2-store</artifactId>
diff --git a/features/api/pom.xml b/features/api/pom.xml
deleted file mode 100644
index fb1050bf0..000000000
--- a/features/api/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. 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>features-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.aaa</groupId>
-    <artifactId>features-aaa-api</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <properties>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- This project -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <!-- YANG tools -->
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-simple</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authn-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-credential-store-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=aaa.git;a=summary</url>
-    </scm>
-</project>
diff --git a/features/api/src/main/features/features.xml b/features/api/src/main/features/features.xml
deleted file mode 100644
index c526e174f..000000000
--- a/features/api/src/main/features/features.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. 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 -->
-<features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-        <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
-    <feature name='odl-aaa-api' description='OpenDaylight :: AAA :: APIs'
-        version='${project.version}'>
-        <bundle>mvn:com.sun.jersey/jersey-server/{{VERSION}}</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.aaa/aaa-authn-api/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.aaa/aaa-credential-store-api/{{VERSION}}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
-    </feature>
-</features>
diff --git a/features/authn/pom.xml b/features/authn/pom.xml
index 0166a693b..85a2362b5 100644
--- a/features/authn/pom.xml
+++ b/features/authn/pom.xml
@@ -191,9 +191,31 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <classifier>features</classifier>
+            <artifactId>aaa-authn-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-credential-store-api</artifactId>
+        </dependency>
+                <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>authz-restconf-config</artifactId>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authz-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-authz-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>authz-service-config</artifactId>
             <type>xml</type>
+            <classifier>config</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
diff --git a/features/authn/src/main/features/features.xml b/features/authn/src/main/features/features.xml
index 860baa3f9..2a738d10e 100644
--- a/features/authn/src/main/features/features.xml
+++ b/features/authn/src/main/features/features.xml
@@ -7,13 +7,37 @@
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.aaa/features-aaa-api/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
 
-    <feature name='odl-aaa-authn-no-cluster' description='OpenDaylight :: AAA :: Authentication - NO CLUSTER'
+    <feature name='odl-aaa-api' description='OpenDaylight :: AAA :: APIs'
+        version='${project.version}'>
+        <bundle>mvn:com.sun.jersey/jersey-server/{{VERSION}}</bundle>
+        <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.aaa/aaa-authn-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.aaa/aaa-credential-store-api/{{VERSION}}</bundle>
+        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
+    </feature>
+
+    <feature name='odl-aaa-authz' description='OpenDaylight :: AAA :: Authorization'
+        version='${project.version}'>
+        <feature version='${project.version}'>odl-aaa-api</feature>
+        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
+        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${config.version}'>odl-config-core</feature>
+        <bundle>mvn:org.opendaylight.aaa/aaa-authz-model/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.aaa/aaa-authz-service/{{VERSION}}</bundle>
+        <configfile
+            finalname="/etc/opendaylight/karaf/08-authz-config.xml">mvn:org.opendaylight.aaa/authz-service-config/{{VERSION}}/xml/config</configfile>
+        <configfile
+            finalname="/etc/opendaylight/karaf/09-rest-connector.xml">mvn:org.opendaylight.aaa/authz-restconf-config/{{VERSION}}/xml/config</configfile>
+    </feature>
+
+    <feature name='odl-aaa-authn-no-cluster' description='OpenDaylight :: AAA :: Deprecated feature'
              version='${project.version}'>
         <feature version='${project.version}'>odl-aaa-api</feature>
 
@@ -225,7 +249,7 @@
         <bundle>mvn:org.opendaylight.aaa/aaa-authn-sssd/{{VERSION}}</bundle>
     </feature>
 
-    <feature name='odl-aaa-authn-sssd-no-cluster' description='OpenDaylight :: AAA :: SSSD Federation - NO CLUSTER'
+    <feature name='odl-aaa-authn-sssd-no-cluster' description='OpenDaylight :: AAA :: Deprecated feature'
              version='${project.version}'>
         <feature version='${project.version}'>odl-aaa-authn-no-cluster</feature>
         <bundle>mvn:org.opendaylight.aaa/aaa-authn-sssd/{{VERSION}}</bundle>
diff --git a/features/authz/pom.xml b/features/authz/pom.xml
deleted file mode 100644
index b09df0e38..000000000
--- a/features/authz/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016 Hewlett-Packard, L.P. 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>features-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.aaa</groupId>
-    <artifactId>features-aaa-authz</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <properties>
-        <config.version>0.6.0-SNAPSHOT</config.version>
-        <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
-        <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
-        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- This project -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-parent</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${yangtools.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <!-- odl-aaa-authz -->
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-config</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>authz-restconf-config</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authz-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-authz-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>authz-service-config</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-    </dependencies>
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=aaa.git;a=summary</url>
-    </scm>
-</project>
diff --git a/features/authz/src/main/features/features.xml b/features/authz/src/main/features/features.xml
deleted file mode 100644
index c5239045e..000000000
--- a/features/authz/src/main/features/features.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. 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 -->
-<features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-api/{{VERSION}}/xml/features</repository>
-
-    <feature name='odl-aaa-authz' description='OpenDaylight :: AAA :: Authorization'
-        version='${project.version}'>
-        <feature version='${project.version}'>odl-aaa-api</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
-        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='${config.version}'>odl-config-core</feature>
-        <bundle>mvn:org.opendaylight.aaa/aaa-authz-model/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.aaa/aaa-authz-service/{{VERSION}}</bundle>
-        <configfile
-            finalname="/etc/opendaylight/karaf/08-authz-config.xml">mvn:org.opendaylight.aaa/authz-service-config/{{VERSION}}/xml/config</configfile>
-        <configfile
-            finalname="/etc/opendaylight/karaf/09-rest-connector.xml">mvn:org.opendaylight.aaa/authz-restconf-config/{{VERSION}}/xml/config</configfile>
-    </feature>
-
-</features>
diff --git a/features/pom.xml b/features/pom.xml
index a5f544095..215fcd4ab 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -21,9 +21,7 @@
   <packaging>pom</packaging>
   <modules>
     <module>shiro</module>
-    <module>api</module>
     <module>authn</module>
-    <module>authz</module>
     <module>aaa-cert</module>
     <module>aaa-cli</module>
   </modules>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index c4a48596a..7ce65eb26 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -46,13 +46,6 @@
         </dependency>
 
         <!-- Project local feautures -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
@@ -60,13 +53,6 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-authz</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa-shiro</artifactId>
diff --git a/pom.xml b/pom.xml
index 33bd16e51..c0066092f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,10 +39,6 @@
     <module>aaa-authn-mdsal-store</module>
     <module>aaa-authz</module>
     <module>aaa-credential-store-api</module>
-    <module>artifacts</module>
-    <module>features</module>
-    <module>karaf</module>
-    <module>parent</module>
     <module>aaa-shiro</module>
     <module>aaa-shiro-act</module>
     <module>aaa-h2-store</module>
@@ -50,6 +46,10 @@
     <module>aaa-cli</module>
     <module>aaa-filterchain</module>
     <module>aaa-cassandra-store</module>
+    <module>artifacts</module>
+    <module>features</module>
+    <module>karaf</module>
+    <module>parent</module>
   </modules>
 
   <build>
-- 
2.36.6