directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [4/5] directory-fortress-commander git commit: FC-105 - remove cycles and fix other findbugs issues
Date Fri, 29 May 2015 00:19:45 GMT
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
index c7bf423..58fe040 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class ObjectPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isAdmin = false;
-    private String label = "Permission Object Page";
 
 
     public ObjectPage( PageParameters parameters )
     {
+        String label = "Permission Object Page";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
index a518069..bc49199 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class OuPermPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isUser = false;
-    private String label = "Permission Organizational Unit Administration";
 
 
     public OuPermPage( PageParameters parameters )
     {
+        String label = "Permission Organizational Unit Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
index 8936e56..bc15312 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class OuUserPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isUser = true;
-    private String label = "User Organizational Unit Administration";
 
 
     public OuUserPage( PageParameters parameters )
     {
+        String label = "User Organizational Unit Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
index a5553f8..af6fc48 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class PermAdminPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isAdmin = true;
-    private String label = "Administrative Permission Operation Page";
 
 
     public PermAdminPage( PageParameters parameters )
     {
+        String label = "Administrative Permission Operation Page";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/PermListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermListModel.java b/src/main/java/org/apache/directory/fortress/web/PermListModel.java
deleted file mode 100644
index 812395e..0000000
--- a/src/main/java/org/apache/directory/fortress/web/PermListModel.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.directory.fortress.core.util.attr.VUtil;
-import org.apache.log4j.Logger;
-import org.apache.wicket.injection.Injector;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.SecurityException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class PermListModel extends Model<SerializableList<Permission>>
-{
-    /** Default serialVersionUID */
-    private static final long serialVersionUID = 1L;
-    
-    @SpringBean
-    private ReviewMgr reviewMgr;
-    private static final Logger LOG = Logger.getLogger(PermListModel.class.getName());
-    private transient Permission perm;
-    private transient SerializableList<Permission> perms = null;
-    private boolean isAdmin;
-
-    public PermListModel( boolean isAdmin, Session session )
-    {
-        Injector.get().inject( this );
-        this.isAdmin = isAdmin;
-        reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * User contains the search arguments.
-     *
-     * @param perm
-     */
-    public PermListModel( Permission perm, boolean isAdmin, Session session )
-    {
-        Injector.get().inject( this );
-        this.isAdmin = isAdmin;
-        this.perm = perm;
-        reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * This data is bound for RoleListPanel
-     *
-     * @return T extends List<Permission> perms data will be bound to panel data view component.
-     */
-    @Override
-    public SerializableList<Permission> getObject()
-    {
-        if ( perms != null )
-        {
-            LOG.debug( ".getObject count: " + perms.size() );
-            
-            return perms;
-        }
-        
-        if (perm == null)
-        {
-            LOG.debug( ".getObject null ");
-            perms = new SerializableList<>( new ArrayList<Permission>() );
-        }
-        else
-        {
-            LOG.debug( " .getObject perm objectNm: " + perm.getObjName() );
-            LOG.debug( " .getObject perm opNm: " + perm.getOpName() );
-            perms = new SerializableList<>( getList( perm ) );
-        }
-        
-        return perms;
-    }
-    
-
-    @Override
-    public void setObject( SerializableList<Permission> object )
-    {
-        LOG.debug( ".setObject count: " + object.size() );
-        this.perms = object;
-    }
-    
-
-    @Override
-    public void detach()
-    {
-        //log.debug(".detach");
-        this.perms = null;
-        this.perm = null;
-    }
-    
-
-    private List<Permission> getList( Permission perm )
-    {
-        List<Permission> permsList = null;
-        if( perm == null )
-        {
-            throw new RuntimeException( "Invalid permission state");
-        }
-        
-        try
-        {
-            String szObjectNm = perm.getObjName();
-            String szOpNm = perm.getOpName();
-            LOG.debug( ".getList objectNm: " + szObjectNm + " opNm: " + szOpNm );
-            perm.setAdmin( isAdmin );
-            permsList = reviewMgr.findPermissions( perm );
-            // sort list by abstract name:
-            if( VUtil.isNotNullOrEmpty( permsList ))
-            {
-                Collections.sort( permsList, new Comparator<Permission>()
-                {
-                    @Override
-                    public int compare(Permission p1, Permission p2)
-                    {
-                        return p1.getAbstractName().compareToIgnoreCase( p2.getAbstractName() );
-                    }
-                } );
-            }
-        }
-        catch ( SecurityException se )
-        {
-            String error = ".getList caught SecurityException=" + se;
-            LOG.warn( error );
-        }
-        
-        return permsList;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/PermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermPage.java b/src/main/java/org/apache/directory/fortress/web/PermPage.java
index 81ecfc1..c563636 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class PermPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isAdmin = false;
-    private String label = "Permission Operation Page";
 
 
     public PermPage( PageParameters parameters )
     {
+        String label = "Permission Operation Page";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/PwPolicyListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PwPolicyListModel.java b/src/main/java/org/apache/directory/fortress/web/PwPolicyListModel.java
deleted file mode 100644
index fd35004..0000000
--- a/src/main/java/org/apache/directory/fortress/web/PwPolicyListModel.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.directory.fortress.core.util.attr.VUtil;
-import org.apache.log4j.Logger;
-import org.apache.wicket.injection.Injector;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.PwPolicyMgr;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.SecurityException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class PwPolicyListModel extends Model<SerializableList<PwPolicy>>
-{
-    /** Default serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-    @SpringBean
-    private PwPolicyMgr pwPolicyMgr;
-    private static final Logger LOG = Logger.getLogger(PwPolicyListModel.class.getName());
-    private transient PwPolicy policy;
-    private transient SerializableList<PwPolicy> policies = null;
-
-    /**
-     * Default constructor
-     */
-    public PwPolicyListModel( Session session )
-    {
-        Injector.get().inject(this);
-        // TODO: enable this after search permission added:
-        //this.pwPolicyMgr.setAdmin( session );
-    }
-
-    
-    /**
-     * User contains the search arguments.
-     *
-     * @param policy
-     */
-    public PwPolicyListModel( PwPolicy policy, Session session )
-    {
-        Injector.get().inject( this );
-        this.policy = policy;
-        // TODO: enable this after search permission added:
-        //this.pwPolicyMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * This data is bound for RoleListPanel
-     *
-     * @return T extends List<Role> roles data will be bound to panel data view component.
-     */
-    @Override
-    public SerializableList<PwPolicy> getObject()
-    {
-        if ( policies != null )
-        {
-            LOG.debug( ".getObject count: " + policies.size() );
-            return policies;
-        }
-        
-        if ( policy == null )
-        {
-            LOG.debug( ".getObject null" );
-            policies = new SerializableList<>( new ArrayList<PwPolicy>() );
-        }
-        else
-        {
-            LOG.debug( ".getObject policyNm: " + policy.getName() );
-            policies = new SerializableList<>( getList( policy ) );
-        }
-        
-        return policies;
-    }
-
-    
-    @Override
-    public void setObject( SerializableList<PwPolicy> object )
-    {
-        LOG.debug( ".setObject count: " + (object).size() );
-        policies = object;
-    }
-    
-
-    @Override
-    public void detach()
-    {
-        //log.debug(".detach");
-        policies = null;
-        policy = null;
-    }
-
-    private List<PwPolicy> getList( PwPolicy policy )
-    {
-        List<PwPolicy> policiesList = null;
-        
-        try
-        {
-            String szPolicyNm = policy != null ? policy.getName() : "";
-            LOG.debug( ".getList policyNm: " + szPolicyNm );
-            policiesList = pwPolicyMgr.search( szPolicyNm );
-            // sort list by policy name:
-            if( VUtil.isNotNullOrEmpty( policiesList ))
-            {
-                Collections.sort( policiesList, new Comparator<PwPolicy>()
-                {
-                    @Override
-                    public int compare(PwPolicy p1, PwPolicy p2)
-                    {
-                        return p1.getName().compareToIgnoreCase( p2.getName() );
-                    }
-                } );
-            }
-        }
-        catch ( SecurityException se )
-        {
-            String error = ".getList caught SecurityException=" + se;
-            LOG.warn( error );
-        }
-        
-        return policiesList;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
index 2c0e798..1ffa343 100644
--- a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
index b26cd34..16bf1bd 100644
--- a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -45,7 +46,6 @@ public class RoleAdminPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isAdmin = true;
-    private String label = "Admin Role Administration";
     private static final Logger LOG = Logger.getLogger( RoleAdminPage.class.getName() );
 
 
@@ -56,6 +56,7 @@ public class RoleAdminPage extends FortressWebBasePage
      */
     public RoleAdminPage( PageParameters parameters )
     {
+        String label = "Admin Role Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/RoleListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RoleListModel.java b/src/main/java/org/apache/directory/fortress/web/RoleListModel.java
deleted file mode 100644
index 927a726..0000000
--- a/src/main/java/org/apache/directory/fortress/web/RoleListModel.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.directory.fortress.core.util.attr.VUtil;
-import org.apache.log4j.Logger;
-import org.apache.wicket.injection.Injector;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.DelReviewMgr;
-import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.SecurityException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class RoleListModel extends Model<SerializableList<? extends Role>>
-{
-    /** Default serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-    @SpringBean
-    private ReviewMgr reviewMgr;
-    @SpringBean
-    private DelReviewMgr delReviewMgr;
-    private static final Logger LOG = Logger.getLogger(RoleListModel.class.getName());
-    private transient Role role;
-    private transient SerializableList<? extends Role> roles = null;
-    private boolean isAdmin;
-
-
-    public RoleListModel( boolean isAdmin, Session session )
-    {
-        Injector.get().inject( this );
-        this.isAdmin = isAdmin;
-        this.reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * User contains the search arguments.
-     *
-     * @param role
-     */
-    public RoleListModel( Role role, boolean isAdmin, Session session )
-    {
-        Injector.get().inject( this );
-        this.role = role;
-        this.isAdmin = isAdmin;
-        this.reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * This data is bound for RoleListPanel
-     *
-     * @return T extends List<Role> roles data will be bound to panel data view component.
-     */
-    @Override
-    public SerializableList<? extends Role> getObject()
-    {
-        if ( roles != null )
-        {
-            LOG.debug(".getObject count: " + roles.size() );
-            return roles;
-        }
-        
-        if ( role == null )
-        {
-            LOG.debug(".getObject null");
-            roles = new SerializableList<>( new ArrayList<Role>() );
-        }
-        else
-        {
-            LOG.debug(".getObject roleNm: " + role.getName() );
-            
-            if ( isAdmin )
-            {
-                roles = new SerializableList<>( getAdminList( ( role ).getName() ) );
-            }
-            else
-            {
-                roles = new SerializableList<>( getList( role.getName() ) );
-            }
-        }
-        
-        return roles;
-    }
-    
-
-    @Override
-    public void setObject( SerializableList<? extends Role> object )
-    {
-        LOG.debug(".setObject count: " + object.size() );
-        this.roles = object;
-    }
-    
-
-    @Override
-    public void detach()
-    {
-        //log.debug(".detach");
-        roles = null;
-        role = null;
-    }
-    
-
-    private List<Role> getList( String szRoleNm )
-    {
-        List<Role> rolesList = null;
-        
-        try
-        {
-            LOG.debug( ".getList roleNm: " + szRoleNm );
-            rolesList = reviewMgr.findRoles( szRoleNm );
-            // sort list by role name:
-            if( VUtil.isNotNullOrEmpty( rolesList ))
-            {
-                Collections.sort( rolesList, new Comparator<Role>()
-                {
-                    @Override
-                    public int compare(Role r1, Role r2)
-                    {
-                        return r1.getName().compareToIgnoreCase( r2.getName() );
-                    }
-                } );
-            }
-        }
-        catch ( org.apache.directory.fortress.core.SecurityException se )
-        {
-            String error = ".getList caught SecurityException=" + se;
-            LOG.warn( error) ;
-        }
-        
-        return rolesList;
-    }
-    
-
-    private List<AdminRole> getAdminList( String szRoleNm )
-    {
-        List<AdminRole> rolesList = null;
-        
-        try
-        {
-            LOG.debug( ".getList roleNm: " + szRoleNm );
-            rolesList = delReviewMgr.findRoles( szRoleNm );
-            if( VUtil.isNotNullOrEmpty( rolesList ))
-            {
-                Collections.sort( rolesList, new Comparator<AdminRole>()
-                {
-                    @Override
-                    public int compare(AdminRole r1, AdminRole r2)
-                    {
-                        return r1.getName().compareToIgnoreCase( r2.getName() );
-                    }
-                } );
-            }
-        }
-        catch ( SecurityException se )
-        {
-            String error = ".getAdminList caught SecurityException=" + se;
-            LOG.warn( error );
-        }
-        
-        return rolesList;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/RolePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RolePage.java b/src/main/java/org/apache/directory/fortress/web/RolePage.java
index 772b1e8..d049a71 100644
--- a/src/main/java/org/apache/directory/fortress/web/RolePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/RolePage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -42,12 +43,12 @@ public class RolePage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isAdmin = false;
-    private String label = "RBAC Role Administration";
     private static final Logger LOG = Logger.getLogger( RolePage.class.getName() );
 
 
     public RolePage( PageParameters parameters )
     {
+        String label = "RBAC Role Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SDListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SDListModel.java b/src/main/java/org/apache/directory/fortress/web/SDListModel.java
deleted file mode 100644
index bae021a..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SDListModel.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.log4j.Logger;
-import org.apache.wicket.injection.Injector;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.util.attr.VUtil;
-import org.apache.directory.fortress.core.SecurityException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SDListModel extends Model<SerializableList<SDSet>>
-{
-    /** Default serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-    @SpringBean
-    private ReviewMgr reviewMgr;
-    private static final Logger LOG = Logger.getLogger(SDListModel.class.getName());
-    private transient SDSet sdSet;
-    private transient SerializableList<SDSet> sdSets = null;
-
-    /**
-     * Default constructor
-     */
-    public SDListModel( boolean isStatic, Session session )
-    {
-        Injector.get().inject( this );
-        reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * User contains the search arguments.
-     *
-     * @param sdSet
-     */
-    public SDListModel( SDSet sdSet, final Session session )
-    {
-        Injector.get().inject( this );
-        this.sdSet = sdSet;
-        reviewMgr.setAdmin( session );
-    }
-    
-
-    /**
-     * This data is bound for SDListPanel
-     *
-     * @return T extends List<SDSet> sdSets data will be bound to panel data view component.
-     */
-    @Override
-    public SerializableList<SDSet> getObject()
-    {
-        if ( sdSets != null )
-        {
-            LOG.debug( ".getObject count: " + sdSets.size() );
-            return sdSets;
-        }
-        
-        if ( sdSet == null )
-        {
-            LOG.debug( ".getObject null" );
-            sdSets = new SerializableList<>( new ArrayList<SDSet>() );
-        }
-        else
-        {
-            LOG.debug( ".getObject sdSetNm: " + sdSet.getName() );
-            sdSets = new SerializableList<>( getList( sdSet ) );
-        }
-        
-        return sdSets;
-    }
-    
-
-    @Override
-    public void setObject( SerializableList<SDSet> object )
-    {
-        LOG.debug( ".setObject count: " + object.size() );
-        sdSets = object;
-    }
-    
-
-    @Override
-    public void detach()
-    {
-        //log.debug(".detach");
-        sdSets = null;
-        sdSet = null;
-    }
-
-    
-    private List<SDSet> getList( SDSet sdSet )
-    {
-        List<SDSet> sdSetList = null;
-
-        if( sdSet == null )
-        {
-            throw new RuntimeException( "Invalid SDSet State" );
-        }
-        
-        try
-        {
-            String szSdSetNm = sdSet.getName();
-            LOG.debug( ".getList sdSetNm: " + szSdSetNm );
-
-            if ( VUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
-            {
-                Object[] roleNms = sdSet.getMembers().toArray();
-                String szRoleNm = (String)roleNms[0];
-                Role role = new Role( szRoleNm );
-                
-                if ( sdSet.getType().equals( SDSet.SDType.STATIC ) )
-                {
-                    sdSetList = reviewMgr.ssdRoleSets( role );
-                }
-                else
-                {
-                    sdSetList = reviewMgr.dsdRoleSets( role );
-                }
-            }
-            else
-            {
-                if ( sdSet.getType().equals( SDSet.SDType.STATIC ) )
-                {
-                    sdSetList = reviewMgr.ssdSets( sdSet );
-                }
-                else
-                {
-                    sdSetList = reviewMgr.dsdSets( sdSet );
-                }
-            }
-            // sort list by set name:
-            if( VUtil.isNotNullOrEmpty( sdSetList ))
-            {
-                Collections.sort( sdSetList, new Comparator<SDSet>()
-                {
-                    @Override
-                    public int compare(SDSet s1, SDSet s2)
-                    {
-                        return s1.getName().compareToIgnoreCase( s2.getName() );
-                    }
-                } );
-            }
-        }
-        catch ( SecurityException se )
-        {
-            String error = ".getList caught SecurityException=" + se;
-            LOG.warn( error );
-        }
-        
-        return sdSetList;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SaveModelEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SaveModelEvent.java b/src/main/java/org/apache/directory/fortress/web/SaveModelEvent.java
deleted file mode 100644
index 227f102..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SaveModelEvent.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.request.ILogData;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-
-import java.util.Collection;
-
-/**
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SaveModelEvent extends AjaxUpdateEvent
-{
-    private int index = 0;
-    private FortEntity entity;
-
-    public Operations getOperation()
-    {
-        return operation;
-    }
-
-    public void setOperation(Operations operation)
-    {
-        this.operation = operation;
-    }
-
-    private Operations operation;
-
-    public enum Operations
-    {
-        ADD,
-        UPDATE,
-        SEARCH,
-        DELETE
-    }
-
-    public SaveModelEvent(AjaxRequestTarget target)
-    {
-        super(target);
-    }
-
-    public SaveModelEvent(AjaxRequestTarget target, int index)
-    {
-        super(target);
-        this.index = index;
-    }
-
-    public SaveModelEvent(AjaxRequestTarget target, FortEntity entity)
-    {
-        super(target);
-        this.entity = entity;
-    }
-
-    public SaveModelEvent(AjaxRequestTarget target, FortEntity entity, Operations operation)
-    {
-        super(target);
-        this.entity = entity;
-        this.operation = operation;
-    }
-
-    public int getIndex()
-    {
-        return index;
-    }
-
-    public void setIndex(int index)
-    {
-        this.index = index;
-    }
-
-    public FortEntity getEntity()
-    {
-        return entity;
-    }
-
-    public void setEntity(FortEntity entity)
-    {
-        this.entity = entity;
-    }
-
-    public static void send(Page page, Component component, FortEntity entity, AjaxRequestTarget target, Operations operation)
-    {
-        component.send(page, Broadcast.BREADTH, new SaveModelEvent(target, entity, operation));
-    }
-
-    public static void send(Page page, Component component, FortEntity entity, AjaxRequestTarget target)
-    {
-        component.send(page, Broadcast.BREADTH, new SaveModelEvent(target, entity));
-    }
-
-    public static void send(Page page, Component component, FortEntity entity)
-    {
-        AjaxRequestTarget target = new AjaxRequestTarget()
-        {
-            @Override
-            public void add(Component component, String markupId)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-                //component.
-            }
-            @Override
-            public void add(Component... components)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void addChildren(MarkupContainer parent, Class<?> childCriteria)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void addListener(IListener listener)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void appendJavaScript(CharSequence javascript)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void prependJavaScript(CharSequence javascript)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void registerRespondListener(ITargetRespondListener listener)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Collection<? extends Component> getComponents()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void focusComponent(Component component)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public IHeaderResponse getHeaderResponse()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public String getLastFocusedElementId()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Page getPage()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public ILogData getLogData()
-
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Integer getPageId()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public boolean isPageInstanceCreated()
-            {
-                return false;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Integer getRenderCount()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Class<? extends IRequestablePage> getPageClass()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public PageParameters getPageParameters()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void respond(IRequestCycle iRequestCycle)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void detach(IRequestCycle iRequestCycle)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-/*
-        //AjaxRequestTarget target = AjaxRequestTarget.get();
-        if (target != null) { //...then this is an ajax request, not a static one
-                target.addComponent(myComponent);
-        }
-*/
-        component.send(page, Broadcast.BREADTH, new SaveModelEvent(target, entity));
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
index 55cab8f..1c09e82 100644
--- a/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,12 @@ public class SdDynamicPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isStatic = false;
-    private String label = "Dynamic Separation of Duties Administration";;
+    ;
 
 
     public SdDynamicPage( PageParameters parameters )
     {
+        String label = "Dynamic Separation of Duties Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java b/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
index 81fef82..a003823 100644
--- a/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -41,11 +42,11 @@ public class SdStaticPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isStatic = true;
-    private String label = "Static Separation of Duties Administration";
 
 
     public SdStaticPage( PageParameters parameters )
     {
+        String label = "Static Separation of Duties Administration";
         add( new Label( GlobalIds.PAGE_HEADER, label ) );
         WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
         FourWaySplitter splitter = new FourWaySplitter();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SecUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecUtils.java b/src/main/java/org/apache/directory/fortress/web/SecUtils.java
deleted file mode 100644
index 3553a64..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SecUtils.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.cfg.Config;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.rbac.Warning;
-import org.apache.directory.fortress.realm.*;
-import org.apache.directory.fortress.realm.GlobalIds;
-import org.apache.log4j.Logger;
-import org.apache.wicket.Component;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-import java.util.List;
-
-/**
- * Common static utils and wrappers used by Wicket web apps to make fortress style security calls.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SecUtils
-{
-    private static final Logger LOG = Logger.getLogger( SecUtils.class.getName() );
-    private static final String PERMS_CACHED = "perms.cached";
-    public static final boolean IS_PERM_CACHED = ( ( Config.getProperty( PERMS_CACHED ) != null ) && ( Config
-        .getProperty( PERMS_CACHED ).equalsIgnoreCase( "true" ) ) );
-
-    /**
-     * Return the fortress session that is cached within the wicket session object.
-     *
-     * @param component needed to get handle to wicket session.
-     * @return fortress session object.
-     */
-    public static Session getSession(Component component)
-    {
-        return ( ( WicketSession ) component.getSession() ).getSession();
-    }
-
-    /**
-     *  Used when web app needs to create a 'trusted' fortress session.
-     *
-     *  Does not check user's password.
-     *
-     * @param accessMgr fortress access mgr apis
-     * @param userId required for rbac session creation.
-     * @return rbac session.
-     */
-    public static Session createSession(AccessMgr accessMgr, String userId)
-    {
-        Session session;
-        try
-        {
-            // Create an RBAC session and attach to Wicket session:
-            session = accessMgr.createSession( new User( userId ), true );
-            String message = "RBAC Session successfully created for userId: " + session.getUserId();
-            LOG.debug( message );
-        }
-        catch ( org.apache.directory.fortress.core.SecurityException se )
-        {
-            String error = "createSession caught SecurityException=" + se;
-            LOG.error( error );
-            throw new RuntimeException( error );
-        }
-        return session;
-    }
-
-    /**
-     * Here the wicket session is loaded with the fortress session and permissions.
-     *
-     *
-     * @param delAccessMgr needed to pull back fortress arbac permissions.
-     * @param session needed for call into accessMgr.
-     */
-    public static void loadPermissionsIntoSession( DelAccessMgr delAccessMgr, Session session)
-    {
-        try
-        {
-            // Retrieve user permissions and attach fortress session to Wicket session:
-            ( ( WicketSession ) WicketSession.get() ).setSession( session );
-            List<Permission> permissions = delAccessMgr.sessionPermissions( session );
-            ( ( WicketSession ) WicketSession.get() ).setPermissions( permissions );
-            String message = "Session successfully created for userId: " + session.getUserId();
-            LOG.debug( message );
-        }
-        catch ( org.apache.directory.fortress.core.SecurityException se )
-        {
-            String error = "loadPermissionsIntoSession caught SecurityException=" + se;
-            LOG.error( error );
-            throw new RuntimeException( error );
-        }
-    }
-
-    /**
-     * Returns the fortress arbac perms that are cashed in the wicket session.
-     *
-     * @param component needed to get a handle on the wicket session object.
-     * @return collection of fortress admin perms.
-     */
-    public static List<Permission> getPermissions(Component component)
-    {
-        return ( ( WicketSession ) component.getSession() ).getPermissions();
-    }
-
-    /**
-     * Retrieve RBAC session permissions from Fortress and place in the Wicket session.
-     */
-    public static void getPermissions( Component component, AccessMgr accessMgr )
-    {
-        try
-        {
-            if ( IS_PERM_CACHED )
-            {
-                WicketSession session = ( WicketSession ) component.getSession();
-                List<Permission> permissions = accessMgr.sessionPermissions( session.getSession() );
-                ( ( WicketSession ) WicketSession.get() ).setPermissions( permissions );
-            }
-        }
-        catch ( org.apache.directory.fortress.core.SecurityException se )
-        {
-            String error = "getPermissions caught SecurityException=" + se;
-            LOG.error( error );
-            throw new RuntimeException( error );
-        }
-    }
-
-    /**
-     * Wrapper for the httpservlet isUserInRole api.
-     *
-     * @param roleName contains the name of role being checked.
-     * @param servletReq handle used to make inquiry.
-     * @return true if authorized, false otherwise.
-     */
-    public static boolean isAuthorized( String roleName, HttpServletRequest servletReq )
-    {
-        boolean isAuthorized = false;
-        if ( servletReq.isUserInRole( roleName ) )
-        {
-            isAuthorized = true;
-        }
-        return isAuthorized;
-    }
-
-    /**
-     * Is the supplied permission in the wicket session cache?  Called by buttons.
-     * if not found, button will be invisible.
-     *
-     * @param permission fortress perm requires {link @Permission#objName} and {link @Permission#opName} are set.
-     * @param component needed to get handle on the wicket session object.
-     * @return true if found, false otherwise
-     */
-    public static boolean isFound( Permission permission, Component component )
-    {
-        List<Permission> permissions = SecUtils.getPermissions( component );
-        return VUtil.isNotNullOrEmpty( permissions ) && permissions.contains( permission );
-    }
-
-    /**
-     * Wrapper to fortress checkAccess api.
-     *
-     * @param component contains the wicket session handle.
-     * @param accessMgr has the checkAccess api
-     * @param objName string value
-     * @param opName string value
-     * @param objId string value
-     * @return true if success, false otherwise.
-     * @throws org.apache.directory.fortress.core.SecurityException checked exception for system errors.
-     */
-    public static boolean checkAccess(Component component, AccessMgr accessMgr, String objName, String opName, String objId ) throws org.apache.directory.fortress.core.SecurityException
-    {
-        WicketSession session = ( WicketSession )component.getSession();
-        Permission permission = new Permission( objName, opName, objId );
-        return accessMgr.checkAccess( session.getSession(), permission );
-    }
-
-    /**
-     * Convert the principal into fortress session and load into wicket session along with perms.
-     *
-     * @param component contains handle to wicket session.
-     * @param j2eePolicyMgr used to call deserize api
-     * @param accessMgr used to call fortress api for role op
-     * @param szPrincipal contains the instance of fortress session deserialized.
-     */
-    public static void initializeSession(Component component, J2eePolicyMgr j2eePolicyMgr, AccessMgr accessMgr, String szPrincipal ) throws SecurityException
-    {
-        Session realmSession = null;
-
-        if(j2eePolicyMgr == null || accessMgr == null)
-        {
-            throw new SecurityException( GlobalIds.SESSION_INITIALIZATION_FAILED, "initializeSession failed - verify the injection of fortress spring beans into your application" );
-        }
-        try
-        {
-            if(VUtil.isNotNullOrEmpty( szPrincipal ))
-                realmSession = j2eePolicyMgr.deserialize( szPrincipal );
-        }
-        catch( SecurityException se )
-        {
-            throw new RuntimeException( se );
-        }
-        if(realmSession != null)
-        {
-            synchronized ( ( WicketSession ) WicketSession.get() )
-            {
-                if ( SecUtils.getSession( component ) == null )
-                {
-                    LOG.info( "realmSession user: " + realmSession.getUserId() );
-                    // Retrieve user permissions and attach RBAC session to Wicket session:
-                    ( ( WicketSession ) WicketSession.get() ).setSession( realmSession );
-                    getPermissions( component, accessMgr );
-                }
-            }
-        }
-    }
-
-    /**
-     * Call RBAC addActiveRole to activate a new role into user's session.
-     * This routine must first retrieves the wicket session.
-     * It is needed because it contains the fortress session which is required for api.
-     * Next it invokes the fortress addActiveRole method.
-     * If all successful refresh user's perms cached as they've changed.
-     *
-     * @param component contains handle to wicket session.
-     * @param target used to display modal if something goes wrong
-     * @param accessMgr used to call fortress api for role op
-     * @param roleName contains the role name target
-     * @return true if success, false otherwise.
-     */
-    public static boolean addActiveRole( Component component, AjaxRequestTarget target, AccessMgr accessMgr, String roleName )
-    {
-        boolean isSuccessful = false;
-        try
-        {
-            WicketSession session = ( WicketSession ) component.getSession();
-            session.getSession().setWarnings( null );
-            accessMgr.addActiveRole( session.getSession(), new UserRole( roleName ) );
-            List<Warning> warnings = session.getSession().getWarnings();
-            if ( VUtil.isNotNullOrEmpty( warnings ) )
-            {
-                for ( Warning warning : warnings )
-                {
-                    LOG.info( "Warning: " + warning.getMsg() + " errCode: " + warning.getId() + " name: " + warning
-                        .getName() + " type: " + warning.getType().toString() );
-                    if ( warning.getType() == Warning.Type.ROLE && warning.getName().equalsIgnoreCase( roleName ) )
-                    {
-                        String error = warning.getMsg() + " code: " + warning.getId();
-                        LOG.error( error );
-                        target.appendJavaScript( ";alert('" + error + "');" );
-                        return false;
-                    }
-                }
-            }
-
-            // User's active role set changed so refresh their permissions:
-            SecUtils.getPermissions( component, accessMgr );
-            isSuccessful = true;
-            String message = "Activate role name: " + roleName + " successful";
-            LOG.info( message );
-        }
-        catch ( org.apache.directory.fortress.core.SecurityException se )
-        {
-            String msg = "Role selection " + roleName + " activation failed because of ";
-            if ( se.getErrorId() == GlobalErrIds.DSD_VALIDATION_FAILED )
-            {
-                msg += "Dynamic SoD rule violation";
-            }
-            else if ( se.getErrorId() == GlobalErrIds.URLE_ALREADY_ACTIVE )
-            {
-                msg += "Role already active in Session";
-            }
-            else
-            {
-                msg += "System error: " + se + ", " + "errId=" + se.getErrorId();
-            }
-            LOG.error( msg );
-            target.appendJavaScript( ";alert('" + msg + "');" );
-        }
-        return isSuccessful;
-    }
-
-    /**
-     * Call RBAC dropActiveRole to deactivate a new role from user's session.
-     * This routine must first retrieves the wicket session.
-     * It is needed because it contains the fortress session which is required for api.
-     * Next it invokes the fortress dropActiveRole method.
-     * If all successful refresh user's perms cached as they've changed.
-     *
-     * @param component contains handle to wicket session.
-     * @param target used to display modal if something goes wrong
-     * @param accessMgr used to call fortress api for role op
-     * @param roleName contains the role name target
-     * @return true if success, false otherwise.
-     */
-    public static boolean dropActiveRole( Component component, AjaxRequestTarget target, AccessMgr accessMgr, String roleName )
-    {
-        boolean isSuccessful = false;
-        try
-        {
-            WicketSession session = ( WicketSession ) component.getSession();
-            accessMgr.dropActiveRole( session.getSession(), new UserRole( roleName ) );
-            // User's active role set changed so refresh their permissions:
-            SecUtils.getPermissions( component, accessMgr );
-            isSuccessful = true;
-            LOG.info( "Fortress dropActiveRole roleName: " + roleName + " was successful" );
-        }
-        catch ( SecurityException se )
-        {
-            String msg = "Role selection " + roleName + " deactivation failed because of ";
-            if ( se.getErrorId() == GlobalErrIds.URLE_NOT_ACTIVE )
-            {
-                msg += "Role not active in session";
-            }
-            else
-            {
-                msg += "System error: " + se + ", " + "errId=" + se.getErrorId();
-            }
-            LOG.error( msg );
-            target.appendJavaScript( ";alert('" + msg + "');" );
-        }
-        return isSuccessful;
-    }
-
-    /**
-     * Enables fortress session on behalf of a java.security.Principal retrieved from the container.
-     *
-     * @param component
-     * @param servletReq
-     * @param j2eePolicyMgr
-     * @param accessMgr
-     * @throws SecurityException
-     */
-    public static void enableFortress( Component component, HttpServletRequest servletReq, J2eePolicyMgr j2eePolicyMgr, AccessMgr accessMgr ) throws SecurityException
-    {
-        // Get the principal from the container:
-        Principal principal = servletReq.getUserPrincipal();
-        // Is this a Java EE secured page && has the User successfully authenticated already?
-        boolean isSecured = principal != null;
-        if(isSecured)
-        {
-            //linksLabel += " for " + principal.getName();
-            if( !isLoggedIn( component ) )
-            {
-                String szPrincipal = principal.toString();
-                // Pull the fortress session from the realm and assert into the Web app's session along with user's perms:
-                SecUtils.initializeSession( component, j2eePolicyMgr, accessMgr, szPrincipal );
-            }
-        }
-    }
-
-    /**
-     * If user has a wicket session then considered logged in.
-     *
-     * @return true if wicket session is not null
-     */
-    public static boolean isLoggedIn( Component component )
-    {
-        boolean isLoggedIn = false;
-        if ( getSession( component ) != null )
-        {
-            isLoggedIn = true;
-        }
-        return isLoggedIn;
-    }
-
-    public static Permission getPermFromId( String id )
-    {
-        Permission perm = null;
-        String[] parts = id.split( "\\." );
-        if(parts != null && parts.length > 1)
-        {
-            String objName = parts[0];
-            String opName = parts[1];
-            perm = new Permission( objName, opName );
-        }
-        return perm;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java b/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
deleted file mode 100644
index fedc6bd..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-
-import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.StringTokenizer;
-
-
-/**
- * ...
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SecureBookmarkablePageLink extends BookmarkablePageLink
-{
-    public <C extends Page> SecureBookmarkablePageLink( String id, Class<C> pageClass, String roleName )
-    {
-        super( id, pageClass );
-        if(!isAuthorized( roleName ))
-        {
-            setVisible( false );
-        }
-    }
-
-    public <C extends Page> SecureBookmarkablePageLink( String id, Class<C> pageClass, PageParameters parameters,
-        String roleName )
-    {
-        super( id, pageClass, parameters );
-        if ( !isAuthorized( roleName ) )
-        {
-            setVisible( false );
-        }
-    }
-
-    private boolean isAuthorized( String roleName )
-    {
-        HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
-        return isAuthorized( roleName, servletReq );
-    }
-
-    private boolean isAuthorized( String roleNames, HttpServletRequest servletReq )
-    {
-        boolean isAuthorized = false;
-        StringTokenizer tokenizer = new StringTokenizer( roleNames, "," );
-        if (tokenizer.countTokens() > 0)
-        {
-            while (tokenizer.hasMoreTokens())
-            {
-                String roleName = tokenizer.nextToken();
-                isAuthorized = SecUtils.isAuthorized( roleName, servletReq );
-            }
-        }
-        return isAuthorized;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
deleted file mode 100644
index ac548d1..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
-import org.apache.log4j.Logger;
-import org.apache.wicket.Component;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.Permission;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * ...
- *
- * @author Shawn McKinney
- * @version $Rev$
- */
-public class SecureIndicatingAjaxButton extends IndicatingAjaxButton
-{
-    Permission perm;
-
-    @SpringBean
-    private AccessMgr accessMgr;
-
-    private static final Logger LOG = Logger.getLogger( SecureIndicatingAjaxButton.class.getName() );
-
-    public SecureIndicatingAjaxButton( Component component, String id, String objectName, String opName )
-    {
-        super( id );
-        this.perm = new Permission(objectName, opName);
-        if( SecUtils.IS_PERM_CACHED)
-        {
-            if(!SecUtils.isFound( perm, this ))
-                setVisible( false );
-        }
-        else
-        {
-            boolean isAuthorized = false;
-            try
-            {
-                WicketSession session = ( WicketSession )component.getSession();
-                isAuthorized = accessMgr.checkAccess( session.getSession(), perm );
-                LOG.info( "Fortress checkAccess objectName: " + objectName + " operationName: " + opName + " userId: " + session.getSession().getUserId() + " result: " + isAuthorized);
-            }
-            catch(org.apache.directory.fortress.core.SecurityException se)
-            {
-                String error = "Fortress SecurityException checkAccess objectName: " + objectName + " operationName: " + opName + " error=" + se;
-                LOG.error( error );
-            }
-            if(!isAuthorized)
-                setVisible( false );
-        }
-    }
-
-    public SecureIndicatingAjaxButton( String id, String roleName )
-    {
-        super( id );
-        HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
-        if( ! SecUtils.isAuthorized( roleName, servletReq ) )
-            setVisible( false );
-    }
-
-    public SecureIndicatingAjaxButton( String id, String objName, String opName )
-    {
-        super( id );
-        if ( !SecUtils.isFound( new Permission( objName, opName ), this ) )
-            setVisible( false );
-    }
-
-    protected boolean checkAccess( String objectName, String opName )
-    {
-        boolean isAuthorized = false;
-        try
-        {
-            WicketSession session = ( WicketSession )getSession();
-            Permission permission = new Permission( objectName, opName );
-            //Permission permission = new Permission( objectName, perm.getOpName() );
-            isAuthorized = accessMgr.checkAccess( session.getSession(), permission );
-            LOG.info( "Fortress checkAccess objectName: " + permission.getObjName() + " operationName: " + permission.getOpName() + " userId: " + session.getSession().getUserId() + " result: " + isAuthorized);
-        }
-        catch(org.apache.directory.fortress.core.SecurityException se)
-        {
-            String error = "Fortress SecurityException checkAccess objectName: " + this.perm.getObjName() + " operationName: " + this.perm.getOpName() + " error=" + se;
-            LOG.error( error );
-        }
-        return isAuthorized;
-    }
-
-    protected boolean checkAccess( )
-    {
-        boolean isAuthorized = false;
-        try
-        {
-            WicketSession session = ( WicketSession )getSession();
-            isAuthorized = accessMgr.checkAccess( session.getSession(), perm );
-            LOG.info( "Fortress checkAccess objName: " + this.perm.getObjName() + " opName: " + this.perm.getOpName() + " userId: " + session.getSession().getUserId() + " result: " + isAuthorized);
-        }
-        catch(org.apache.directory.fortress.core.SecurityException se)
-        {
-            String error = "Fortress SecurityException checkAccess objName: " + this.perm.getObjName() + " opName: " + this.perm.getOpName() + " error=" + se;
-            LOG.error( error );
-        }
-        return isAuthorized;
-    }
-
-
-    protected boolean checkAccess( String objectId )
-    {
-        boolean isAuthorized = false;
-        try
-        {
-            WicketSession session = ( WicketSession )getSession();
-            Permission finePerm = new Permission(perm.getObjName(), perm.getOpName(), objectId);
-            isAuthorized = accessMgr.checkAccess( session.getSession(), finePerm );
-            LOG.info( "Fortress checkAccess objName: " + this.perm.getObjName() + " opName: " + this.perm.getOpName() + ", objId: " + finePerm.getObjId() + ", userId: " + session.getSession().getUserId() + " result: " + isAuthorized);
-        }
-        catch(org.apache.directory.fortress.core.SecurityException se)
-        {
-            String error = "Fortress SecurityException checkAccess objectName: " + this.perm.getObjName() + " opName: " + this.perm.getOpName() + ", objId: " + objectId + ", error=" + se;
-            LOG.error( error );
-        }
-        return isAuthorized;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
deleted file mode 100644
index 1b36060..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
-import org.apache.directory.fortress.core.rbac.Permission;
-
-
-/**
- * ...
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SecureIndicatingAjaxLink extends IndicatingAjaxLink
-{
-    /** Default serialVersionUID */
-    private static final long serialVersionUID = 1L;
-
-
-    public SecureIndicatingAjaxLink( String id, String objName, String opName )
-    {
-        super( id );
-        if ( !SecUtils.isFound( new Permission( objName, opName ), this ) )
-            setEnabled( false );
-    }
-
-
-    @Override
-    public void onClick( AjaxRequestTarget target )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SelectModelEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SelectModelEvent.java b/src/main/java/org/apache/directory/fortress/web/SelectModelEvent.java
deleted file mode 100644
index 620dd70..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SelectModelEvent.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.request.ILogData;
-import org.apache.wicket.request.IRequestCycle;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SelectModelEvent extends AjaxUpdateEvent
-{
-    private int index = 0;
-    private FortEntity entity;
-
-    public SelectModelEvent(AjaxRequestTarget target)
-    {
-        super(target);
-    }
-
-    public SelectModelEvent(AjaxRequestTarget target, int index)
-    {
-        super(target);
-        this.index = index;
-    }
-
-    public SelectModelEvent(AjaxRequestTarget target, FortEntity entity)
-    {
-        super(target);
-        this.entity = entity;
-    }
-
-    public int getIndex()
-    {
-        return index;
-    }
-
-    public void setIndex(int index)
-    {
-        this.index = index;
-    }
-
-    public FortEntity getEntity()
-    {
-        return entity;
-    }
-
-    public void setEntity(FortEntity entity)
-    {
-        this.entity = entity;
-    }
-
-    public static void send(Page page, Component component, FortEntity entity)
-    {
-        AjaxRequestTarget target = new AjaxRequestTarget()
-        {
-            @Override
-            public void add(Component component, String markupId)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-                //component.
-            }
-            @Override
-            public void add(Component... components)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void addChildren(MarkupContainer parent, Class<?> childCriteria)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void addListener(IListener listener)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void appendJavaScript(CharSequence javascript)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void prependJavaScript(CharSequence javascript)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void registerRespondListener(ITargetRespondListener listener)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Collection<? extends Component> getComponents()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void focusComponent(Component component)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public IHeaderResponse getHeaderResponse()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public String getLastFocusedElementId()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Page getPage()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public ILogData getLogData()
-
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Integer getPageId()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public boolean isPageInstanceCreated()
-            {
-                return false;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Integer getRenderCount()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public Class<? extends IRequestablePage> getPageClass()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public PageParameters getPageParameters()
-            {
-                return null;  //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void respond(IRequestCycle iRequestCycle)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-            @Override
-            public void detach(IRequestCycle iRequestCycle)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-        component.send(page, Broadcast.BREADTH, new SelectModelEvent(target, entity));
-    }
-
-    public static void send(Page page, Component component, FortEntity entity, AjaxRequestTarget target)
-    {
-        component.send(page, Broadcast.BREADTH, new SaveModelEvent(target, entity));
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fe719b1b/src/main/java/org/apache/directory/fortress/web/SerializableList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SerializableList.java b/src/main/java/org/apache/directory/fortress/web/SerializableList.java
deleted file mode 100644
index 084a204..0000000
--- a/src/main/java/org/apache/directory/fortress/web/SerializableList.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.web;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-public class SerializableList<E> implements List<E>, Serializable
-{
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-    
-    private List<E> list;
-        
-    public SerializableList( List<E> list )
-    {
-        this.list = list;
-    }
-
-    @Override
-    public int size()
-    {
-        return list.size();
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return list.isEmpty();
-    }
-
-    @Override
-    public boolean contains( Object o )
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public Iterator<E> iterator()
-    {
-        return list.iterator();
-    }
-
-    @Override
-    public Object[] toArray()
-    {
-        return list.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray( T[] a )
-    {
-        return list.toArray( a );
-    }
-
-    @Override
-    public boolean add( E e )
-    {
-        return list.add( e );
-    }
-
-    @Override
-    public boolean remove( Object o )
-    {
-        return list.remove( o );
-    }
-
-    @Override
-    public boolean containsAll( Collection<?> c )
-    {
-        return list.containsAll( c );
-    }
-
-    @Override
-    public boolean addAll( Collection<? extends E> c )
-    {
-        return list.addAll( c );
-    }
-
-    @Override
-    public boolean addAll( int index, Collection<? extends E> c )
-    {
-        return list.addAll( index, c );
-    }
-
-    @Override
-    public boolean removeAll( Collection<?> c )
-    {
-        return list.removeAll( c );
-    }
-
-    @Override
-    public boolean retainAll( Collection<?> c )
-    {
-        return list.retainAll( c );
-    }
-
-    @Override
-    public void clear()
-    {
-        list.clear();
-    }
-
-    @Override
-    public E get( int index )
-    {
-        return list.get( index );
-    }
-
-    @Override
-    public E set( int index, E element )
-    {
-        return list.set( index, element );
-    }
-
-    @Override
-    public void add( int index, E element )
-    {
-        list.add( index, element );
-    }
-
-    @Override
-    public E remove( int index )
-    {
-        return list.remove( index );
-    }
-
-    @Override
-    public int indexOf( Object o )
-    {
-        return list.indexOf( o );
-    }
-
-    @Override
-    public int lastIndexOf( Object o )
-    {
-        return list.lastIndexOf( o );
-    }
-
-    @Override
-    public ListIterator<E> listIterator()
-    {
-        return list.listIterator();
-    }
-
-    @Override
-    public ListIterator<E> listIterator( int index )
-    {
-        return list.listIterator( index );
-    }
-
-    @Override
-    public List<E> subList( int fromIndex, int toIndex )
-    {
-        return list.subList( fromIndex, toIndex );
-    }
-}


Mime
View raw message