AAA-160: Fix aaa-cli commands

Adding final to the command line variable make the variable
finally initalized and not re-assign value at runtime.

Access the datastore using AaaShiroProvider and delete the
old datastore service.

Change-Id: I8c2f7d39bd5e9be5349a2b922bb8afdbbb0b15a3
Signed-off-by: serngawy <m.elserngawy@gmail.com>

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/AaaCliAbstractCommand.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/AaaCliAbstractCommand.java
index e1f15b8ee607bec9d63bf4fb6a83a4ce6aafee2e..89eef552763ff0e2e79fe909f871a0a93581ebda 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/AaaCliAbstractCommand.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/AaaCliAbstractCommand.java
@@ -8,6 +8,7 @@
 package org.opendaylight.aaa.cli;
 
 import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.opendaylight.aaa.AAAShiroProvider;
 import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.User;
 import org.opendaylight.aaa.cli.utils.CliUtils;
@@ -24,8 +25,8 @@ public abstract class AaaCliAbstractCommand extends OsgiCommandSupport {
     private static volatile String authUser = null;
     protected final IIDMStore identityStore;
 
-    public AaaCliAbstractCommand(final IIDMStore identityStore) {
-        this.identityStore = identityStore;
+    public AaaCliAbstractCommand() {
+        this.identityStore = AAAShiroProvider.getIdmStore();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java
index 2960ca9773a5de0bee242931148d4255b13bbb6d..a42637cb03cedb666839a57abba5332cee0ec995 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.Domain;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
@@ -35,8 +34,8 @@ public class AddDomain extends AaaCliAbstractCommand {
             "--domainDescription" }, description = "The domain Description", required = true, multiValued = false)
     private String domainDesc = "";
 
-    public AddDomain(final IIDMStore identityStore) {
-        super(identityStore);
+    public AddDomain() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java
index 88fe8ac58d048b2cf7c86b62482342e4ccb7a417..95ea9ff69c1438a7052d95f40e6bd7a3e1f84caa 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.Grant;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
@@ -36,8 +35,8 @@ public class AddGrant extends AaaCliAbstractCommand {
             "--roleName" }, description = "The role name", required = false, multiValued = false)
     private String roleName = "";
 
-    public AddGrant(final IIDMStore identityStore) {
-        super(identityStore);
+    public AddGrant() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java
index b4fce30c6eb47788594057f515adc9e81097ef51..9506b587868d96f60bf34293bf063b2eefe06947 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.Role;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
@@ -36,8 +35,8 @@ public class AddRole extends AaaCliAbstractCommand {
             "--roleDescription" }, description = "The role Description", required = true, multiValued = false)
     private String roleDesc = "";
 
-    public AddRole(final IIDMStore identityStore) {
-        super(identityStore);
+    public AddRole() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddUser.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddUser.java
index 8f5a4e1aa05c69fa652c3c10625798851d230e46..ac979f04396e74894be898e3cc77824ee033e5ee 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddUser.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddUser.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.Grant;
 import org.opendaylight.aaa.api.model.User;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
@@ -30,38 +29,38 @@ public class AddUser extends AaaCliAbstractCommand {
             description = "The user name",
             required = true,
             multiValued = false)
-    private final String userName = "";
+    private String userName = "";
 
     @Option(name = "-dname",
             aliases = { "--domainName" },
             description = "The domain name",
             required = true,
             multiValued = false)
-    private final String domainName = "";
+    private String domainName = "";
 
     @Option(name = "-rname",
             aliases = { "--roleName" },
             description = "The role name",
             required = false,
             multiValued = false)
-    private final String roleName = "";
+    private String roleName = "";
 
     @Option(name = "-desc",
             aliases = { "--userDescription" },
             description = "The user Description",
             required = false,
             multiValued = false)
-    private final String userDesc = "";
+    private String userDesc = "";
 
     @Option(name = "-email",
             aliases = { "--userEmail" },
             description = "The user email",
             required = false,
             multiValued = false)
-    private final String userEmail = "";
+    private String userEmail = "";
 
-    public AddUser(final IIDMStore identityStore) {
-        super(identityStore);
+    public AddUser() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java
index af71f2ee7b097af28c95cf962d53690ff0b34ae4..bd08168a196a7c990bca8934f44d8efcc7cf2e62 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java
@@ -11,6 +11,7 @@ package org.opendaylight.aaa.cli.dmstore;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.opendaylight.aaa.AAAShiroProvider;
 import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.SHA256Calculator;
 import org.opendaylight.aaa.api.model.User;
@@ -34,8 +35,8 @@ public class ChangeUserPassword extends OsgiCommandSupport {
             "--userName" }, description = "The user name", required = true, multiValued = false)
     private String userName = "";
 
-    public ChangeUserPassword(final IIDMStore identityStore) {
-        this.identityStore = identityStore;
+    public ChangeUserPassword() {
+        this.identityStore = AAAShiroProvider.getIdmStore();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLDomains.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLDomains.java
index 0c23e36c0ff2ece0790dfd1c315c99dc79b0ea74..183700bd11c148461507b0df009072e03a8a2484 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLDomains.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLDomains.java
@@ -9,7 +9,6 @@
 package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 
@@ -23,8 +22,8 @@ import org.opendaylight.aaa.cli.utils.CliUtils;
  */
 public class ListODLDomains extends AaaCliAbstractCommand {
 
-    public ListODLDomains(final IIDMStore identityStore) {
-        super(identityStore);
+    public ListODLDomains() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLRoles.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLRoles.java
index 066280b5fb958c8424eddd3edb8db058e4c2e5c8..4f63cc26602eb56ab65a2429c92e3e26265a7a6a 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLRoles.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLRoles.java
@@ -9,7 +9,6 @@
 package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 
@@ -23,8 +22,8 @@ import org.opendaylight.aaa.cli.utils.CliUtils;
  */
 public class ListODLRoles extends AaaCliAbstractCommand {
 
-    public ListODLRoles(final IIDMStore identityStore) {
-        super(identityStore);
+    public ListODLRoles() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLUsers.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLUsers.java
index 1062f39fa5ced9a618e35ef0383fe385f8a72ee9..ba43df6718cf21f746e7b2e4695a3cc96a8f8d41 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLUsers.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ListODLUsers.java
@@ -9,7 +9,6 @@
 package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 
@@ -23,8 +22,8 @@ import org.opendaylight.aaa.cli.utils.CliUtils;
  */
 public class ListODLUsers extends AaaCliAbstractCommand {
 
-    public ListODLUsers(final IIDMStore identityStore) {
-        super(identityStore);
+    public ListODLUsers() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java
index 4f72ed47db6c68c63c2d4b2f13eab73d61f0b413..20dd160811f32d970aa33ae70007b6ab0e49c82d 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 import org.opendaylight.aaa.cli.utils.DataStoreUtils;
@@ -28,8 +27,8 @@ public class RemoveDomain extends AaaCliAbstractCommand {
             "--domainName" }, description = "The domain name", required = true, multiValued = false)
     private String domainName = "";
 
-    public RemoveDomain(final IIDMStore identityStore) {
-        super(identityStore);
+    public RemoveDomain() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java
index 87f182648ee33dafdc9b120b7f9fbac5bd9ad474..a502ff361daad33e1127effdd1a0a6eff4ca0e57 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 import org.opendaylight.aaa.cli.utils.DataStoreUtils;
@@ -36,8 +35,8 @@ public class RemoveGrant extends AaaCliAbstractCommand {
             "--roleName" }, description = "The role name", required = false, multiValued = false)
     private String roleName = "";
 
-    public RemoveGrant(final IIDMStore identityStore) {
-        super(identityStore);
+    public RemoveGrant() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java
index 7b8c8e85bffae89b9a991fe58e225733544a3fef..b2d119e6410806ece16e5c2e1b39613f49253afe 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 import org.opendaylight.aaa.cli.utils.DataStoreUtils;
@@ -26,10 +25,10 @@ public class RemoveRole extends AaaCliAbstractCommand {
 
     @Option(name = "-name", aliases = {
             "--roleName" }, description = "The role name", required = true, multiValued = false)
-    private final String roleName = "";
+    private String roleName = "";
 
-    public RemoveRole(final IIDMStore identityStore) {
-        super(identityStore);
+    public RemoveRole() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java
index dfec5353617988e796eda4c382be3346a8400c1a..2667112488018585dedca9d66b09cc16a2f3af74 100644 (file)
--- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java
+++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java
@@ -10,7 +10,6 @@ package org.opendaylight.aaa.cli.dmstore;
 
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.utils.CliUtils;
 import org.opendaylight.aaa.cli.utils.DataStoreUtils;
@@ -28,8 +27,8 @@ public class RemoveUser extends AaaCliAbstractCommand {
             "--userName" }, description = "The user name", required = true, multiValued = false)
     private String userName = "";
 
-    public RemoveUser(final IIDMStore identityStore) {
-        super(identityStore);
+    public RemoveUser() {
+        super();
     }
 
     @Override

diff --git a/aaa-cli/src/main/resources/org/opendaylight/blueprint/commands.xml b/aaa-cli/src/main/resources/org/opendaylight/blueprint/commands.xml
index 2281fe35cb931628113812c2ab01a5f938f29371..bb19e84777cd1a724e56109cda478596ef8d500e 100644 (file)
--- a/aaa-cli/src/main/resources/org/opendaylight/blueprint/commands.xml
+++ b/aaa-cli/src/main/resources/org/opendaylight/blueprint/commands.xml
@@ -10,24 +10,16 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.ListODLUsers">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.ListODLUsers" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.ListODLDomains">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.ListODLDomains" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.ListODLRoles">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.ListODLRoles" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.ChangeUserPassword">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.ChangeUserPassword" />
         </command>
         <command>
             <action class="org.opendaylight.aaa.cli.cert.GetODLSelfSignCert">
@@ -65,44 +57,28 @@
             </action>
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.AddRole">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.AddRole" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.AddDomain">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.AddDomain" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.AddUser">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.AddUser" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.AddGrant">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.AddGrant" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.RemoveGrant">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.RemoveGrant" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.RemoveUser">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.RemoveUser" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.RemoveRole">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.RemoveRole" />
         </command>
         <command>
-            <action class="org.opendaylight.aaa.cli.dmstore.RemoveDomain">
-                <argument ref="iIDMStore" />
-            </action>
+            <action class="org.opendaylight.aaa.cli.dmstore.RemoveDomain" />
         </command>
     </command-bundle>
 

diff --git a/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/AaaCliAbstractCommandTest.java b/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/AaaCliAbstractCommandTest.java
index da43c8aa9b8e38267ebdc0cfcf97b7f7094a46a9..fdc428c42d41215f2bb185a729b077b42c3f681f 100644 (file)
--- a/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/AaaCliAbstractCommandTest.java
+++ b/aaa-cli/src/test/java/org/opendaylight/aaa/cli/test/AaaCliAbstractCommandTest.java
@@ -15,7 +15,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opendaylight.aaa.api.IIDMStore;
 import org.opendaylight.aaa.api.model.User;
 import org.opendaylight.aaa.cli.AaaCliAbstractCommand;
 import org.opendaylight.aaa.cli.SessionsManager;
@@ -34,8 +33,8 @@ public class AaaCliAbstractCommandTest {
 
     class TestAaaCliAbstractCommand extends AaaCliAbstractCommand {
 
-        TestAaaCliAbstractCommand(IIDMStore identityStore) {
-            super(identityStore);
+        TestAaaCliAbstractCommand() {
+            super();
         }
 
         @Override

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 6d0480091c0bc38e0bfb5cab263ba871295753fa..75a65919f9b53ab53e28a9fa7d8c2404a84b15c9 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -216,6 +216,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
+                            org.opendaylight.aaa,
                             org.opendaylight.aaa.shiro,
                             org.opendaylight.aaa.shiro.idm,
                             org.opendaylight.aaa.shiro.tokenauthrealm,