You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2014/11/11 21:35:17 UTC
[07/27] directory-fortress-commander git commit: change package
structure and names, pom improvements, license
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/java/org/openldap/commander/panel/UserListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/commander/panel/UserListPanel.java b/src/main/java/org/openldap/commander/panel/UserListPanel.java
deleted file mode 100644
index 481a890..0000000
--- a/src/main/java/org/openldap/commander/panel/UserListPanel.java
+++ /dev/null
@@ -1,807 +0,0 @@
-/*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-package org.openldap.commander.panel;
-
-import com.inmethod.grid.IGridColumn;
-import com.inmethod.grid.SizeUnit;
-import com.inmethod.grid.column.PropertyColumn;
-import com.inmethod.grid.treegrid.TreeGrid;
-import org.apache.log4j.Logger;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxCallListener;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.Radio;
-import org.apache.wicket.markup.html.form.RadioGroup;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.Model;
-import org.openldap.commander.GlobalIds;
-import org.openldap.commander.GlobalUtils;
-import org.openldap.commander.SaveModelEvent;
-import org.openldap.commander.SecureIndicatingAjaxButton;
-import org.openldap.commander.SecureIndicatingAjaxLink;
-import org.openldap.commander.SelectModelEvent;
-import org.openldap.commander.UserListModel;
-import org.openldap.commander.UserPage;
-import org.openldap.fortress.rbac.FortEntity;
-import org.openldap.fortress.rbac.OrgUnit;
-import org.openldap.fortress.rbac.Permission;
-import org.openldap.fortress.rbac.User;
-import org.openldap.fortress.rbac.UserRole;
-import org.openldap.fortress.util.attr.VUtil;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeNode;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Shawn McKinney
- * @version $Rev$
- */
-public class UserListPanel extends FormComponentPanel
-{
- private static final Logger LOG = Logger.getLogger( UserListPanel.class.getName() );
- private Form listForm;
- private DefaultTreeModel treeModel;
- private DefaultMutableTreeNode node;
- private TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid;
- private DefaultMutableTreeNode rootNode;
- private String selectedRadioButton;
- private TextField f1Fld;
- private TextField f2Fld;
- private Label f1Lbl;
- private Label f2Lbl;
- private Label searchFieldsLbl;
- private WebMarkupContainer userformsearchfields;
- private WebMarkupContainer searchFields;
- private RadioGroup radioGroup;
- private static final String USERS = "U";
- private static final String ROLES = "R";
- private static final String ADMIN_ROLES = "A";
- private static final String OUS = "O";
- private static final String PERMS = "P";
- private Permission permission;
- private SearchFields searchData = new SearchFields();
- private static String PERM_OBJ_LABEL = "Object Name";
- private static String PERM_OP_LABEL = "Operation Name";
- private static String USER_LABEL = "User ID";
- private static String ROLE_LABEL = "Role Name";
- private static String ADMIN_LABEL = "Admin Role Name";
- private static String OU_LABEL = "Organization";
- private String field1Label = USER_LABEL;
- private String field2Label;
- private String searchFieldsLabel = USER_SEARCH_LABEL;
- private static String USER_SEARCH_LABEL = "Search By User";
- private static String ROLE_SEARCH_LABEL = "Search By Role";
- private static String ADMIN_SEARCH_LABEL = "Search By Admininstrative Role";
- private static String OU_SEARCH_LABEL = "Search By User Organization";
- private static String PERM_SEARCH_LABEL = "Search By Permission";
-
- public UserListPanel( String id )
- {
- super( id );
- UserListModel userListModel = new UserListModel( new User(), GlobalUtils.getRbacSession( this ) );
- setDefaultModel( userListModel );
- addGrid();
- userformsearchfields = new WebMarkupContainer( "userformsearchfields" );
- userformsearchfields.setOutputMarkupId( true );
- listForm.add( userformsearchfields );
- addRadioButtons();
- addSearchFields();
- addButtons();
- }
-
- private void addRadioButtons()
- {
- radioGroup = new RadioGroup( "searchOptions", new PropertyModel( this, "selectedRadioButton" ) );
- AjaxFormComponentUpdatingBehavior ajaxRadioUpdater = new AjaxFormChoiceComponentUpdatingBehavior()
- {
- @Override
- protected void onUpdate( final AjaxRequestTarget target )
- {
- processRadioButton( target );
- }
- };
- radioGroup.add( ajaxRadioUpdater );
- add( radioGroup );
- Radio userRb = new Radio( "userRb", new Model( USERS ) );
- radioGroup.add( userRb );
- Radio roleRb = new Radio( "roleRb", new Model( ROLES ) );
- radioGroup.add( roleRb );
- Radio adminRoleRb = new Radio( "adminRoleRb", new Model( ADMIN_ROLES ) );
- radioGroup.add( adminRoleRb );
- Radio ouRb = new Radio( "ouRb", new Model( OUS ) );
- radioGroup.add( ouRb );
- Radio permRb = new Radio( "permRb", new Model( new String( PERMS ) ) );
- radioGroup.add( permRb );
- radioGroup.setOutputMarkupId( true );
- radioGroup.setRenderBodyOnly( false );
-
- userformsearchfields.add( radioGroup );
- selectedRadioButton = USERS;
-
- addRoleSearchModal( roleRb );
- addAdminRoleSearchModal( adminRoleRb );
- addOUSearchModal( ouRb );
- addPermSearchModal( permRb );
- }
-
- private void addSearchFields()
- {
- searchFields = new WebMarkupContainer( "searchfields" );
- searchFieldsLbl = new Label( "searchFieldslabel", new PropertyModel<String>( this, "searchFieldsLabel" ) );
- searchFields.add( searchFieldsLbl );
- f1Lbl = new Label( "field1label", new PropertyModel<String>( this, "field1Label" ) );
- searchFields.add( f1Lbl );
- f2Lbl = new Label( "field2label", new PropertyModel<String>( this, "field2Label" ) );
- searchFields.add( f2Lbl );
-
- f1Fld = new TextField( GlobalIds.FIELD_1, new PropertyModel<String>( this, "searchData.field1" ) );
- f1Fld.setOutputMarkupId( true );
- AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
- {
- @Override
- protected void onUpdate( final AjaxRequestTarget target )
- {
- target.add( f1Fld );
- }
- };
- f1Fld.add( ajaxUpdater );
- searchFields.add( f1Fld );
-
- f2Fld = new TextField( GlobalIds.FIELD_2, new PropertyModel<String>( this, "searchData.field2" ) );
- f2Fld.setOutputMarkupId( true );
- ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
- {
- @Override
- protected void onUpdate( final AjaxRequestTarget target )
- {
- target.add( f2Fld );
- }
- };
- f2Fld.add( ajaxUpdater );
- f2Fld.setVisible( false );
- searchFields.add( f2Fld );
- searchFields.setOutputMarkupId( true );
- userformsearchfields.add( searchFields );
- }
-
- private void addButtons()
- {
- userformsearchfields.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR,
- GlobalIds.FIND_USERS )
- {
- @Override
- protected void onSubmit( AjaxRequestTarget target, Form form )
- {
- LOG.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
- info( "Searching Users..." );
- String searchVal = "";
- if ( VUtil.isNotNullOrEmpty( searchData.getField1() ) )
- {
- searchVal = searchData.getField1();
- }
- if ( selectedRadioButton.equals( PERMS ) )
- {
- LOG.debug( ".onSubmit PERMS RB selected" );
-
- Permission srchPerm = new Permission();
- srchPerm.setObjName( searchData.getField1() );
- srchPerm.setOpName( searchData.getField2() );
- setDefaultModel( new UserListModel( srchPerm, GlobalUtils.getRbacSession( this ) ) );
- }
- else
- {
- User srchUser = new User();
- if ( selectedRadioButton.equals( USERS ) )
- {
- LOG.debug( ".onSubmit USERS_PAGE RB selected" );
- srchUser.setUserId( searchVal );
- }
- else if ( selectedRadioButton.equals( ROLES ) )
- {
- LOG.debug( ".onSubmit ROLES RB selected" );
- srchUser.setRole( searchVal );
- }
- else if ( selectedRadioButton.equals( ADMIN_ROLES ) )
- {
- LOG.debug( ".onSubmit ADMIN ROLES RB selected" );
- srchUser.setAdminRole( searchVal );
- }
- else if ( selectedRadioButton.equals( OUS ) )
- {
- LOG.debug( ".onSubmit OUS RB selected" );
- srchUser.setOu( searchVal );
- }
- else if ( selectedRadioButton.equals( PERMS ) )
- {
- LOG.debug( ".onSubmit PERMS RB selected" );
- }
- setDefaultModel( new UserListModel( srchUser, GlobalUtils.getRbacSession( this ) ) );
- }
-
- treeModel.reload();
- rootNode.removeAllChildren();
- List<User> users = ( List<User> ) getDefaultModelObject();
- if ( VUtil.isNotNullOrEmpty( users ) )
- {
- for ( User user : users )
- {
- rootNode.add( new DefaultMutableTreeNode( user ) );
- }
- info( "Search returned " + users.size() + " matching objects" );
- }
- else
- {
- info( "No matching objects found" );
- }
- target.add( grid );
- }
-
- @Override
- public void onError( AjaxRequestTarget target, Form form )
- {
- LOG.warn( ".search.onError" );
- target.add();
- }
- } );
- userformsearchfields.add( new AjaxSubmitLink( GlobalIds.CLEAR )
- {
- @Override
- protected void onSubmit( AjaxRequestTarget target, Form form )
- {
- setResponsePage( new UserPage() );
- }
-
- @Override
- public void onError( AjaxRequestTarget target, Form form )
- {
- LOG.warn( "UserListPanel.clear.onError" );
- }
-
- @Override
- protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
- {
- super.updateAjaxAttributes( attributes );
- AjaxCallListener ajaxCallListener = new AjaxCallListener()
- {
- @Override
- public CharSequence getFailureHandler( Component component )
- {
- return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
- }
- };
- attributes.getAjaxCallListeners().add( ajaxCallListener );
- }
- } );
- }
-
- private void addRoleSearchModal( Radio roleRb )
- {
- final ModalWindow rolesModalWindow;
- userformsearchfields.add( rolesModalWindow = new ModalWindow( "rolesearchmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(),
- rolesModalWindow, false );
- rolesModalWindow.setContent( roleSearchModalPanel );
- rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
- {
- @Override
- public void onClose( AjaxRequestTarget target )
- {
- UserRole roleConstraint = roleSearchModalPanel.getRoleSelection();
- if ( roleConstraint != null )
- {
- LOG.debug( "modal selected:" + roleConstraint.getName() );
- searchData.setField1( roleConstraint.getName() );
- selectedRadioButton = ROLES;
- enableRoleSearch();
- target.add( searchFields );
- target.add( radioGroup );
- }
- }
- } );
-
- roleRb.add( new SecureIndicatingAjaxLink( "roleAssignLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_ROLES )
- {
- public void onClick( AjaxRequestTarget target )
- {
- String msg = "clicked on roles search";
- msg += "roleSelection: " + searchData.getField1();
- roleSearchModalPanel.setRoleSearchVal( searchData.getField1() );
- roleSearchModalPanel.setAdmin( false );
- target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
- rolesModalWindow.show( target );
- }
-
- @Override
- protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
- {
- super.updateAjaxAttributes( attributes );
- AjaxCallListener ajaxCallListener = new AjaxCallListener()
- {
- @Override
- public CharSequence getFailureHandler( Component component )
- {
- return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
- }
- };
- attributes.getAjaxCallListeners().add( ajaxCallListener );
- }
- } );
- rolesModalWindow.setTitle( "RBAC Role Search Modal" );
- rolesModalWindow.setInitialWidth( 700 );
- rolesModalWindow.setInitialHeight( 450 );
- rolesModalWindow.setCookieName( "role-assign-modal" );
- }
-
- private void addAdminRoleSearchModal( Radio adminRoleRb )
- {
- final ModalWindow adminRolesModalWindow;
- userformsearchfields.add( adminRolesModalWindow = new ModalWindow( "adminrolesearchmodal" ) );
- final RoleSearchModalPanel adminRoleSearchModalPanel = new RoleSearchModalPanel( adminRolesModalWindow
- .getContentId(), adminRolesModalWindow, true );
- adminRolesModalWindow.setContent( adminRoleSearchModalPanel );
- adminRolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
- {
- @Override
- public void onClose( AjaxRequestTarget target )
- {
- UserRole roleConstraint = adminRoleSearchModalPanel.getRoleSelection();
- if ( roleConstraint != null )
- {
- searchData.setField1( roleConstraint.getName() );
- selectedRadioButton = ADMIN_ROLES;
- enableAdminSearch();
- target.add( searchFields );
- target.add( radioGroup );
- }
- }
- } );
-
- adminRoleRb.add( new SecureIndicatingAjaxLink( "adminRoleAssignLinkLbl", GlobalIds.DEL_REVIEW_MGR,
- GlobalIds.FIND_ROLES )
- {
- public void onClick( AjaxRequestTarget target )
- {
- String msg = "clicked on admin roles search";
- msg += "adminRoleSelection: " + searchData.getField1();
- adminRoleSearchModalPanel.setRoleSearchVal( searchData.getField1() );
- adminRoleSearchModalPanel.setAdmin( true );
- LOG.debug( msg );
- target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
- adminRolesModalWindow.show( target );
- }
-
- @Override
- protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
- {
- super.updateAjaxAttributes( attributes );
- AjaxCallListener ajaxCallListener = new AjaxCallListener()
- {
- @Override
- public CharSequence getFailureHandler( Component component )
- {
- return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
- }
- };
- attributes.getAjaxCallListeners().add( ajaxCallListener );
- }
- } );
- adminRolesModalWindow.setTitle( "Admin Role Search Modal" );
- adminRolesModalWindow.setInitialWidth( 700 );
- adminRolesModalWindow.setInitialHeight( 450 );
- adminRolesModalWindow.setCookieName( "role-assign-modal" );
- }
-
- private void addOUSearchModal( Radio ouRb )
- {
- final ModalWindow ousModalWindow;
- userformsearchfields.add( ousModalWindow = new ModalWindow( "ousearchmodal" ) );
- final OUSearchModalPanel ouSearchModalPanel = new OUSearchModalPanel( ousModalWindow.getContentId(),
- ousModalWindow, true );
- ousModalWindow.setContent( ouSearchModalPanel );
- ousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
- {
- @Override
- public void onClose( AjaxRequestTarget target )
- {
- OrgUnit ou = ouSearchModalPanel.getSelection();
- if ( ou != null )
- {
- searchData.setField1( ou.getName() );
- }
- selectedRadioButton = OUS;
- enableOuSearch();
- target.add( searchFields );
- target.add( radioGroup );
- }
- } );
- ouRb.add( new SecureIndicatingAjaxLink( "ouAssignLinkLbl", GlobalIds.DEL_REVIEW_MGR, "searchOU" )
- {
- public void onClick( AjaxRequestTarget target )
- {
- String msg = "clicked on ou search";
- msg += "ouSelection: " + searchData.getField1();
- ouSearchModalPanel.setSearchVal( searchData.getField1() );
- target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
- ousModalWindow.show( target );
- }
-
- @Override
- protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
- {
- super.updateAjaxAttributes( attributes );
- AjaxCallListener ajaxCallListener = new AjaxCallListener()
- {
- @Override
- public CharSequence getFailureHandler( Component component )
- {
- return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
- }
- };
- attributes.getAjaxCallListeners().add( ajaxCallListener );
- }
- } );
-
- ousModalWindow.setTitle( "User Organizational Unit Search Modal" );
- ousModalWindow.setInitialWidth( 450 );
- ousModalWindow.setInitialHeight( 450 );
- ousModalWindow.setCookieName( "userou-modal" );
- }
-
- @Override
- public void onEvent( IEvent event )
- {
- if ( event.getPayload() instanceof SaveModelEvent )
- {
- SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
- switch ( modelEvent.getOperation() )
- {
- case ADD:
- add( modelEvent.getEntity() );
- break;
- case UPDATE:
- modelChanged();
- break;
- case DELETE:
- prune();
- break;
- default:
- LOG.error( "onEvent caught invalid operation" );
- break;
- }
- AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
- //target.add(grid);
- LOG.debug( ".onEvent AJAX - UserListPanel - SaveModelEvent: " + target.toString() );
- }
- }
-
- private void addPermSearchModal( Radio permRb )
- {
- final ModalWindow permsModalWindow;
- userformsearchfields.add( permsModalWindow = new ModalWindow( "permsearchmodal" ) );
- final PermSearchModalPanel permSearchModalPanel = new PermSearchModalPanel( permsModalWindow.getContentId(),
- permsModalWindow, false );
- permsModalWindow.setContent( permSearchModalPanel );
- permsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
- {
- @Override
- public void onClose( AjaxRequestTarget target )
- {
- Permission permSelection = permSearchModalPanel.getSelection();
- if ( permSelection != null )
- {
- searchData.setField1( permSelection.getObjName() );
- searchData.setField2( permSelection.getOpName() );
- }
- selectedRadioButton = PERMS;
- enablePermSearch();
- target.add( searchFields );
- target.add( radioGroup );
- }
- } );
- permRb.add( new SecureIndicatingAjaxLink( "permLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_PERMISSIONS )
- {
- public void onClick( AjaxRequestTarget target )
- {
- String msg = "clicked on perms search";
- msg += "permSelection: " + permission;
- String objectSearchVal = "";
- if ( VUtil.isNotNullOrEmpty( searchData.getField1() ) )
- {
- objectSearchVal = searchData.getField1();
- }
- permSearchModalPanel.setSearchVal( objectSearchVal );
- LOG.debug( msg );
- target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
- permsModalWindow.show( target );
- }
-
- @Override
- protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
- {
- super.updateAjaxAttributes( attributes );
- AjaxCallListener ajaxCallListener = new AjaxCallListener()
- {
- @Override
- public CharSequence getFailureHandler( Component component )
- {
- return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
- }
- };
- attributes.getAjaxCallListeners().add( ajaxCallListener );
- }
- } );
- permsModalWindow.setTitle( "Admin Permission Search Modal" );
- permsModalWindow.setInitialWidth( 650 );
- permsModalWindow.setInitialHeight( 450 );
- permsModalWindow.setCookieName( "perm-search-modal" );
- }
-
- private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
- {
- Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for ( IModel<DefaultMutableTreeNode> model : selected )
- {
- DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent( node );
- User user = ( User ) node.getUserObject();
- LOG.debug( ".removeSelectedItems user node: " + user.getUserId() );
- List<User> users = ( ( List<User> ) getDefaultModel().getObject() );
- users.remove( user.getUserId() );
- }
- }
-
- private DefaultTreeModel createTreeModel( List<User> users )
- {
- DefaultTreeModel model;
- User rootUser = new User();
- rootUser.setAddress( null );
- rootNode = new DefaultMutableTreeNode( rootUser );
- model = new DefaultTreeModel( rootNode );
- if ( users == null )
- {
- LOG.debug( "no Users found" );
- }
- else
- {
- LOG.debug( ".createTreeModel Users found:" + users.size() );
- for ( User user : users )
- {
- rootNode.add( new DefaultMutableTreeNode( user ) );
- }
- }
- return model;
- }
-
- private void addGrid()
- {
- List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode,
- String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
- columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "UserId" ), "userObject.UserId" ) );
-/*
- columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "Name" ), "userObject.Name" ) );
-*/
- PropertyColumn ou = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "User Organization" ), "userObject.Ou" );
- ou.setInitialSize( 150 );
- columns.add( ou );
- columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "Description" ), "userObject.Description" ) );
- columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "Address" ), "userObject.Address.Addresses" ) );
- columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "City" ), "userObject.Address.City" ) );
- PropertyColumn state = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "State" ), "userObject.Address.State" );
- state.setInitialSize( 50 );
- columns.add( state );
-/*
- PropertyColumn locked = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Lock"), "userObject.locked");
- locked.setInitialSize(40);
- columns.add(locked);
- PropertyColumn reset = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Reset"), "userObject.reset");
- reset.setInitialSize(40);
- columns.add(reset);
-*/
- PropertyColumn roles = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "RBAC Role Assignments" ), "userObject.Roles" );
- roles.setInitialSize( 400 );
- columns.add( roles );
- PropertyColumn adminRoles = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
- String>( Model.of( "Admin Role Assignments" ), "userObject.AdminRoles" );
- adminRoles.setInitialSize( 400 );
- columns.add( adminRoles );
-
- List<User> users = ( List<User> ) getDefaultModel().getObject();
- treeModel = createTreeModel( users );
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "usertreegrid", treeModel, columns )
- {
- @Override
- public void selectItem( IModel itemModel, boolean selected )
- {
- node = ( DefaultMutableTreeNode ) itemModel.getObject();
- if ( !node.isRoot() )
- {
- User user = ( User ) node.getUserObject();
- LOG.debug( "TreeGrid.addGrid.selectItem selected user =" + user.getUserId() );
- if ( super.isItemSelected( itemModel ) )
- {
- LOG.debug( "TreeGrid.addGrid.selectItem item is selected" );
- super.selectItem( itemModel, false );
- }
- else
- {
- super.selectItem( itemModel, true );
- SelectModelEvent.send( getPage(), this, user );
- }
- }
- }
- };
- grid.setContentHeight( 50, SizeUnit.EM );
- grid.setAllowSelectMultiple( false );
- grid.setClickRowToSelect( true );
- grid.setClickRowToDeselect( false );
- grid.setSelectToEdit( false );
- // expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
- this.listForm = new Form( "userlistform" );
- this.listForm.add( grid );
- add( this.listForm );
- grid.setOutputMarkupId( true );
- }
-
- public void add( FortEntity entity )
- {
- if ( getDefaultModelObject() != null )
- {
- List<User> users = ( ( List<User> ) getDefaultModelObject() );
- users.add( ( User ) entity );
- LOG.debug( "UserListPanel.add tree depth: " + rootNode.getChildCount() );
- treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, rootNode.getChildCount() );
- //treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, users.size());
- }
- }
-
- public void prune()
- {
- removeSelectedItems( grid );
- }
-
- private void enableOuSearch()
- {
- f2Fld.setVisible( false );
- f2Lbl.setVisible( false );
- field1Label = OU_LABEL;
- searchFieldsLabel = OU_SEARCH_LABEL;
- }
-
- private void enableAdminSearch()
- {
- f2Fld.setVisible( false );
- f2Lbl.setVisible( false );
- field1Label = ADMIN_LABEL;
- searchFieldsLabel = ADMIN_SEARCH_LABEL;
- }
-
- private void enableRoleSearch()
- {
- f2Fld.setVisible( false );
- f2Lbl.setVisible( false );
- field1Label = ROLE_LABEL;
- searchFieldsLabel = ROLE_SEARCH_LABEL;
- }
-
- private void enableUserSearch()
- {
- f2Fld.setVisible( false );
- f2Lbl.setVisible( false );
- field1Label = USER_LABEL;
- searchFieldsLabel = USER_SEARCH_LABEL;
- }
-
- private void enablePermSearch()
- {
- f2Fld.setVisible( true );
- f2Lbl.setVisible( true );
- field1Label = PERM_OBJ_LABEL;
- field2Label = PERM_OP_LABEL;
- searchFieldsLabel = PERM_SEARCH_LABEL;
- }
-
- private void processRadioButton( AjaxRequestTarget target )
- {
- LOG.debug( "RADIO Button: " + selectedRadioButton );
- if ( selectedRadioButton.equals( USERS ) )
- {
- enableUserSearch();
- }
- else if ( selectedRadioButton.equals( ROLES ) )
- {
- enableRoleSearch();
- }
- else if ( selectedRadioButton.equals( ADMIN_ROLES ) )
- {
- enableAdminSearch();
- }
- else if ( selectedRadioButton.equals( OUS ) )
- {
- enableOuSearch();
- }
- else if ( selectedRadioButton.equals( PERMS ) )
- {
- enablePermSearch();
- }
- searchData = new SearchFields();
- target.add( searchFields );
- }
-
- class SearchFields implements Serializable
- {
- private String field1;
- private String field2;
- private String field3;
-
- String getField1()
- {
- return field1;
- }
-
- void setField1( String field1 )
- {
- this.field1 = field1;
- }
-
- String getField2()
- {
- return field2;
- }
-
- void setField2( String field2 )
- {
- this.field2 = field2;
- }
-
- String getField3()
- {
- return field3;
- }
-
- void setField3( String field3 )
- {
- this.field3 = field3;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/java/org/openldap/commander/panel/UserSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/commander/panel/UserSearchModalPanel.java b/src/main/java/org/openldap/commander/panel/UserSearchModalPanel.java
deleted file mode 100644
index 4f0cd97..0000000
--- a/src/main/java/org/openldap/commander/panel/UserSearchModalPanel.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-package org.openldap.commander.panel;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.PageableListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.openldap.commander.GlobalIds;
-import org.openldap.commander.GlobalUtils;
-import org.openldap.fortress.ReviewMgr;
-import org.openldap.fortress.rbac.User;
-
-/**
- *
- * @author Shawn McKinney
- * @version $Rev$
- */
-public class UserSearchModalPanel extends Panel
-{
- @SpringBean
- private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(UserSearchModalPanel.class.getName());
- private ModalWindow window;
- private User userSelection;
- private String userSearchVal;
-
- /**
- * @param id
- */
- public UserSearchModalPanel( String id, ModalWindow window)
- {
- super( id );
- // TODO: add later:
- this.reviewMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- this.window = window;
- loadPanel();
- }
-
- public void loadPanel()
- {
- LoadableDetachableModel requests = getListViewModel();
- PageableListView policyView = createListView( requests );
- add( policyView );
- add( new AjaxPagingNavigator( "usernavigator", policyView ) );
- }
-
- private PageableListView createListView( final LoadableDetachableModel requests )
- {
- final PageableListView listView = new PageableListView( "userdataview", requests, 10 )
- {
- @Override
- protected void populateItem( final ListItem item )
- {
- final User modelObject = ( User ) item.getModelObject();
- item.add( new AjaxLink<Void>( GlobalIds.SELECT )
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target)
- {
- userSelection = modelObject;
- window.close( target );
- }
- } );
- item.add( new Label( GlobalIds.USER_ID, new PropertyModel( item.getModel(), GlobalIds.USER_ID ) ) );
- item.add( new Label( GlobalIds.DESCRIPTION, new PropertyModel( item.getModel(), GlobalIds.DESCRIPTION ) ) );
- item.add( new Label( GlobalIds.NAME, new PropertyModel( item.getModel(), GlobalIds.NAME ) ) );
- item.add( new Label( GlobalIds.OU, new PropertyModel( item.getModel(), GlobalIds.OU ) ) );
- item.add( new Label( GlobalIds.TITLE, new PropertyModel( item.getModel(), GlobalIds.TITLE ) ) );
- item.add( new JpegImage( GlobalIds.JPEGPHOTO )
- {
- @Override
- protected byte[] getPhoto()
- {
- byte[] photo;
- photo = modelObject.getJpegPhoto();
- return photo;
- }
- } );
- }
- };
- return listView;
- }
-
- private LoadableDetachableModel getListViewModel()
- {
- final LoadableDetachableModel ret = new LoadableDetachableModel()
- {
- @Override
- protected Object load()
- {
- List<User> users = null;
- try
- {
- userSelection = null;
- if(userSearchVal == null)
- userSearchVal = "";
- users = reviewMgr.findUsers( new User( userSearchVal ) );
- }
- catch ( org.openldap.fortress.SecurityException se )
- {
- String error = "loadPanel caught SecurityException=" + se;
- LOG.error( error );
- }
- return users;
- }
- };
- return ret;
- }
-
- public User getUserSelection()
- {
- return userSelection;
- }
-
- public void setSearchVal( String searchVal )
- {
- this.userSearchVal = searchVal;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/CommanderDemoUsers.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/CommanderDemoUsers.xml b/src/main/resources/CommanderDemoUsers.xml
deleted file mode 100644
index 0712221..0000000
--- a/src/main/resources/CommanderDemoUsers.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
-<project basedir="." default="all" name="Fortress Sample Data">
- <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
- <classpath path="${java.class.path}"/>
- </taskdef>
-
- <target name="all">
- <FortressAdmin>
-
- <adduser>
- <user userId="test" password="test" description="Commander Demo User" ou="demousrs1" cn="test" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0" photo="TestPhoto1.jpeg"/>
- <user userId="test1" password="test" description="Commander Demo User1" ou="demousrs1" cn="test1" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
- <user userId="test2" password="test" description="Commander Demo User2" ou="demousrs1" cn="test2" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
- <user userId="test3" password="test" description="Commander Group Demo User2" ou="demousrs1" cn="test3" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
- </adduser>
-
- <adduseradminrole>
- <userrole userId="test" name="FortressSuperAdmin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test1" name="UserAdmin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test2" name="AuditAdmin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test3" name="FortressSuperAdmin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- </adduseradminrole>
-
- <adduserrole>
- <userrole userId="test" name="CommanderSuperUser" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test1" name="ROLE_USERS" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test2" name="ROLE_AUDITOR" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test3" name="CommanderGroupAdmin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- </adduserrole>
-
- <addadminrole>
- <role name="UserAdmin" description="Fortress User Admin" osps="APP0" osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0" beginrange="" endrange=""/>
- <role name="AuditAdmin" description="Fortress Auditor" osps="APP0" osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0" beginrange="" endrange=""/>
- </addadminrole>
-
- <addpermgrant>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchBinds" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAuthZs" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="getUserAuthZs" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchUserSessions" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAdminMods" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchInvalidUsers" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readUser" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findUsers" roleNm="AuditAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="AuditAdmin" admin="true"/>
-
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findUsers" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedUsers" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedRoles" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedUsers" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedRoles" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="userPermissions" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findRoles" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="searchOU" roleNm="UserAdmin" admin="true"/>
-
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="disableUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="changePassword" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="lockUserAccount" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="unlockUserAccount" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="resetPassword" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="assignUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deassignUser" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" roleNm="FortressSuperAdmin" admin="true"/>
-
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="add" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="update" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="delete" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="addProperty" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deleteProperty" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="assign" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deassign" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="read" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="find" roleNm="UserAdmin" admin="true"/>
- <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="findWithUsers" roleNm="UserAdmin" admin="true"/>
- </addpermgrant>
-
-
- <addrole>
- <role name="ROLE_USERS" description="Grants User page access in Commander"/>
- <role name="ROLE_ROLES" description="Grants Role page access in Commander"/>
- <role name="ROLE_PERMS" description="Grants Perm page access in Commander"/>
- <role name="ROLE_SSDS" description="Grants Static SoD page access in Commander"/>
- <role name="ROLE_DSDS" description="Grants Dynamic SoD page access in Commander"/>
- <role name="ROLE_POLICIES" description="Grants Password Policy page access in Commander"/>
- <role name="ROLE_PERMOBJS" description="Grants Permission Object page access in Commander"/>
- <role name="ROLE_USEROUS" description="Grants User Organization page access in Commander"/>
- <role name="ROLE_PERMOUS" description="Grants Permission Organization page access in Commander"/>
- <role name="ROLE_ADMINROLES" description="Grants Admin Role page access in Commander"/>
- <role name="ROLE_ADMINOBJS" description="Grants Admin Permission Object page access in Commander"/>
- <role name="ROLE_ADMINPERMS" description="Grants Admin Permission page access in Commander"/>
- <role name="ROLE_AUDIT_AUTHZS" description="Grants Audit Authorization page access in Commander"/>
- <role name="ROLE_AUDIT_MODS" description="Grants Audit Modification page access in Commander"/>
- <role name="ROLE_AUDIT_BINDS" description="Grants Audit Bind page access in Commander"/>
- <role name="ROLE_AUDITOR" description="Grants acces to all Audit pages"/>
- <role name="ROLE_GROUPS" description="Grants Group page access in Commander"/>
- <role name="CommanderSuperUser" description="Role to access Commander pages and funtions"/>
- <role name="CommanderGroupAdmin" description="Access User, Group, Audit and PW Policy Pages"/>
- </addrole>
-
- <addroleinheritance>
- <relationship child="CommanderSuperUser" parent="ROLE_USERS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_ROLES"/>
- <relationship child="CommanderSuperUser" parent="ROLE_PERMS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_SSDS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_DSDS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_POLICIES"/>
- <relationship child="CommanderSuperUser" parent="ROLE_PERMOBJS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_USEROUS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_PERMOUS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_ADMINROLES"/>
- <relationship child="CommanderSuperUser" parent="ROLE_ADMINOBJS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_ADMINPERMS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_AUDIT_AUTHZS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_AUDIT_BINDS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_AUDIT_MODS"/>
- <relationship child="CommanderSuperUser" parent="ROLE_GROUPS"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_GROUPS"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_POLICIES"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_USERS"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_AUDIT_AUTHZS"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_AUDIT_BINDS"/>
- <relationship child="CommanderGroupAdmin" parent="ROLE_AUDIT_MODS"/>
- <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_BINDS"/>
- <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_AUTHZS"/>
- <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_MODS"/>
- </addroleinheritance>
-
- </FortressAdmin>
- </target>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/FortressWebDemoUsers.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
new file mode 100644
index 0000000..1ff3480
--- /dev/null
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project basedir="." default="all" name="Fortress Sample Data">
+ <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
+ <classpath path="${java.class.path}"/>
+ </taskdef>
+
+ <target name="all">
+ <FortressAdmin>
+
+ <adduser>
+ <user userId="test" password="password" description="Fortress Web Demo User" ou="demousrs1" cn="test" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0" photo="TestPhoto1.jpeg"/>
+ <user userId="test1" password="password" description="Fortress Web Demo User1" ou="demousrs1" cn="test1" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
+ <user userId="test2" password="password" description="Fortress Web Demo User2" ou="demousrs1" cn="test2" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
+ <user userId="test3" password="password" description="Fortress Web Group Demo User2" ou="demousrs1" cn="test3" sn="user" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="none" endLockDate="none" dayMask="1234567" timeout="0"/>
+ </adduser>
+
+ <adduseradminrole>
+ <!-- this fortress-core-super-admin role is created in the fortress core DelegatedAdminMgrLoad.xml policy file:-->
+ <userrole userId="test" name="fortress-core-super-admin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test1" name="fortress-web-user-admin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test2" name="fortress-web-audit-admin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test3" name="fortress-core-super-admin" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ </adduseradminrole>
+
+ <adduserrole>
+ <userrole userId="test" name="fortress-web-super-user" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test1" name="ROLE_USERS" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test2" name="ROLE_AUDITOR" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <userrole userId="test3" name="fortress-web-group-admin-user" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ </adduserrole>
+
+ <addadminrole>
+ <role name="fortress-web-user-admin" description="Fortress User Admin" osps="APP0" osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0" beginrange="" endrange=""/>
+ <role name="fortress-web-audit-admin" description="Fortress Auditor" osps="APP0" osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0" beginrange="" endrange=""/>
+ </addadminrole>
+
+ <addpermgrant>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchBinds" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="getUserAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchUserSessions" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAdminMods" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchInvalidUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
+
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedUsers" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedRoles" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedUsers" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedRoles" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="userPermissions" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findRoles" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="searchOU" roleNm="fortress-web-user-admin" admin="true"/>
+
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="disableUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="changePassword" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="lockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="unlockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="resetPassword" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="assignUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deassignUser" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" roleNm="fortress-web-user-admin" admin="true"/>
+
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="add" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="update" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="delete" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="addProperty" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="deleteProperty" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="assign" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="deassign" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="read" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="find" roleNm="fortress-web-user-admin" admin="true"/>
+ <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="findWithUsers" roleNm="fortress-web-user-admin" admin="true"/>
+ </addpermgrant>
+
+
+ <addrole>
+ <role name="ROLE_USERS" description="Grants User page access in Fortress Web"/>
+ <role name="ROLE_ROLES" description="Grants Role page access in Fortress Web"/>
+ <role name="ROLE_PERMS" description="Grants Perm page access in Fortress Web"/>
+ <role name="ROLE_SSDS" description="Grants Static SoD page access in Fortress Web"/>
+ <role name="ROLE_DSDS" description="Grants Dynamic SoD page access in Fortress Web"/>
+ <role name="ROLE_POLICIES" description="Grants Password Policy page access in Fortress Web"/>
+ <role name="ROLE_PERMOBJS" description="Grants Permission Object page access in Fortress Web"/>
+ <role name="ROLE_USEROUS" description="Grants User Organization page access in Fortress Web"/>
+ <role name="ROLE_PERMOUS" description="Grants Permission Organization page access in Fortress Web"/>
+ <role name="ROLE_ADMINROLES" description="Grants Admin Role page access in Fortress Web"/>
+ <role name="ROLE_ADMINOBJS" description="Grants Admin Permission Object page access in Fortress Web"/>
+ <role name="ROLE_ADMINPERMS" description="Grants Admin Permission page access in Fortress Web"/>
+ <role name="ROLE_AUDIT_AUTHZS" description="Grants Audit Authorization page access in Fortress Web"/>
+ <role name="ROLE_AUDIT_MODS" description="Grants Audit Modification page access in Fortress Web"/>
+ <role name="ROLE_AUDIT_BINDS" description="Grants Audit Bind page access in Fortress Web"/>
+ <role name="ROLE_AUDITOR" description="Grants acces to all Audit pages"/>
+ <role name="ROLE_GROUPS" description="Grants Group page access in Fortress Web"/>
+ <role name="fortress-web-super-user" description="Role to access Fortress Web pages and funtions"/>
+ <role name="fortress-web-group-admin-user" description="Access User, Group, Audit and PW Policy Pages"/>
+ </addrole>
+
+ <addroleinheritance>
+ <relationship child="fortress-web-super-user" parent="ROLE_USERS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_ROLES"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_PERMS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_SSDS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_DSDS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_POLICIES"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_PERMOBJS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_USEROUS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_PERMOUS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_ADMINROLES"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_ADMINOBJS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_ADMINPERMS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_AUDIT_AUTHZS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_AUDIT_BINDS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_AUDIT_MODS"/>
+ <relationship child="fortress-web-super-user" parent="ROLE_GROUPS"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_GROUPS"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_POLICIES"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_USERS"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_AUDIT_AUTHZS"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_AUDIT_BINDS"/>
+ <relationship child="fortress-web-group-admin-user" parent="ROLE_AUDIT_MODS"/>
+ <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_BINDS"/>
+ <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_AUTHZS"/>
+ <relationship child="ROLE_AUDITOR" parent="ROLE_AUDIT_MODS"/>
+ </addroleinheritance>
+
+ </FortressAdmin>
+ </target>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/META-INF/context.xml b/src/main/resources/META-INF/context.xml
index efcb9b4..da43bbe 100644
--- a/src/main/resources/META-INF/context.xml
+++ b/src/main/resources/META-INF/context.xml
@@ -1,6 +1,24 @@
+<!--
+ 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.
+-->
<Context path="/commander" reloadable="true">
- <Realm className="org.openldap.sentry.tomcat.Tc7AccessMgrProxy"
+ <Realm className="org.apache.directory.fortress.realm.tomcat.Tc7AccessMgrProxy"
debug="0"
resourceName="UserDatabase"
defaultRoles=""
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/TestPhoto1.jpeg
----------------------------------------------------------------------
diff --git a/src/main/resources/TestPhoto1.jpeg b/src/main/resources/TestPhoto1.jpeg
index e178cf2..37dc4d9 100644
Binary files a/src/main/resources/TestPhoto1.jpeg and b/src/main/resources/TestPhoto1.jpeg differ
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index cd30c72..2e2ef79 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -1,18 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
+ 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.
+-->
+
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:sec="http://www.springframework.org/schema/security"
@@ -41,39 +46,39 @@
</bean>
<!-- These Fortress Manager beans are used as api for RBAC/IAM domain model -->
- <bean id="reviewMgr" class="org.openldap.fortress.ReviewMgrFactory" scope="prototype"
+ <bean id="reviewMgr" class="org.apache.directory.fortress.core.ReviewMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="adminMgr" class="org.openldap.fortress.AdminMgrFactory" scope="prototype"
+ <bean id="adminMgr" class="org.apache.directory.fortress.core.AdminMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="accessMgr" class="org.openldap.fortress.AccessMgrFactory" scope="prototype"
+ <bean id="accessMgr" class="org.apache.directory.fortress.core.AccessMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="delReviewMgr" class="org.openldap.fortress.DelReviewMgrFactory" scope="prototype"
+ <bean id="delReviewMgr" class="org.apache.directory.fortress.core.DelReviewMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="delAdminMgr" class="org.openldap.fortress.DelAdminMgrFactory" scope="prototype"
+ <bean id="delAdminMgr" class="org.apache.directory.fortress.core.DelAdminMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="delAccessMgr" class="org.openldap.fortress.DelAccessMgrFactory" scope="prototype"
+ <bean id="delAccessMgr" class="org.apache.directory.fortress.core.DelAccessMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="auditMgr" class="org.openldap.fortress.AuditMgrFactory" scope="prototype"
+ <bean id="auditMgr" class="org.apache.directory.fortress.core.AuditMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="pwPolicyMgr" class="org.openldap.fortress.PwPolicyMgrFactory" scope="prototype"
+ <bean id="pwPolicyMgr" class="org.apache.directory.fortress.core.PwPolicyMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
- <bean id="groupMgr" class="org.openldap.fortress.ldap.group.GroupMgrFactory" scope="prototype"
+ <bean id="groupMgr" class="org.apache.directory.fortress.core.ldap.group.GroupMgrFactory" scope="prototype"
factory-method="createInstance">
<constructor-arg value="HOME"/>
</bean>
@@ -94,7 +99,7 @@
</bean>
<!-- Inject spring context into wicket pages -->
- <bean id="wicketApplication" class="org.openldap.commander.ApplicationContext"></bean>
+ <bean id="wicketApplication" class="org.apache.directory.fortress.web.ApplicationContext"></bean>
<!-- setup spring security using preauthenticated (java ee) strategy -->
<bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
@@ -167,37 +172,37 @@
<property name="securityMetadataSource">
<sec:filter-invocation-definition-source>
<!-- before spring interceptor recognizes these roles, the j2ee preauthentication filter requires prior declaration in web.xml -->
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.userpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.userpage"
access="ROLE_RBAC_ADMIN,ROLE_USERS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.rolepage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.rolepage"
access="ROLE_RBAC_ADMIN,ROLE_ROLES"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.permpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.permpage"
access="ROLE_RBAC_ADMIN,ROLE_PERMS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.sdstaticpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.sdstaticpage"
access="ROLE_RBAC_ADMIN,ROLE_SSDS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.sddynamicpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.sddynamicpage"
access="ROLE_RBAC_ADMIN,ROLE_DSDS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.pwpolicypage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.pwpolicypage"
access="ROLE_RBAC_ADMIN,ROLE_POLICIES"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.objectpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.objectpage"
access="ROLE_RBAC_ADMIN,ROLE_PERMOBJS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.ouuserpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.ouuserpage"
access="ROLE_RBAC_ADMIN,ROLE_USEROUS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.oupermpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.oupermpage"
access="ROLE_RBAC_ADMIN,ROLE_PERMOUS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.roleadminpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.roleadminpage"
access="ROLE_RBAC_ADMIN,ROLE_ADMINROLES"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.objectadminpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.objectadminpage"
access="ROLE_RBAC_ADMIN,ROLE_ADMINOBJS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.permadminpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.permadminpage"
access="ROLE_RBAC_ADMIN,ROLE_ADMINPERMS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.auditauthzpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.auditauthzpage"
access="ROLE_RBAC_ADMIN,ROLE_AUDIT_AUTHZS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.auditmodpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.auditmodpage"
access="ROLE_RBAC_ADMIN,ROLE_AUDIT_MODS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.auditbindpage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.auditbindpage"
access="ROLE_RBAC_ADMIN,ROLE_AUDIT_BINDS"/>
- <sec:intercept-url pattern="/wicket/bookmarkable/org.openldap.commander.grouppage"
+ <sec:intercept-url pattern="/wicket/bookmarkable/org.apache.directory.fortress.web.grouppage"
access="ROLE_RBAC_ADMIN,ROLE_GROUPS"/>
</sec:filter-invocation-definition-source>
</property>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/ehcache.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
index d48378f..b6f55c7 100755
--- a/src/main/resources/ehcache.xml
+++ b/src/main/resources/ehcache.xml
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
- ~
- ~ Copyright 1998-2014 The OpenLDAP Foundation.
- ~ All rights reserved.
- ~
- ~ Redistribution and use in source and binary forms, with or without
- ~ modification, are permitted only as authorized by the OpenLDAP
- ~ Public License.
- ~
- ~ A copy of this license is available in the file LICENSE in the
- ~ top-level directory of the distribution or, alternatively, at
- ~ <http://www.OpenLDAP.org/license.html>.
- -->
+ 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.
+-->
<!--
Fortress CacheManager Configuration
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/fortress.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/fortress.properties b/src/main/resources/fortress.properties
index c8e858d..57afc1f 100644
--- a/src/main/resources/fortress.properties
+++ b/src/main/resources/fortress.properties
@@ -1,24 +1,28 @@
#
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+# 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
#
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
-#
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
+# 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.
#
# Host name and port of LDAP DIT:
host=localhost
-port=389
+port=10389
# These credentials are used for read/write access to all nodes under suffix:
-admin.user=cn=Manager,dc=openldap,dc=org
+admin.user=uid=admin,ou=system
admin.pw=secret
# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
@@ -34,7 +38,7 @@ max.admin.conn=10
# This node contains fortress properties stored on behalf of connecting LDAP clients:
config.realm=DEFAULT
-config.root=ou=Config,dc=openldap,dc=org
+config.root=ou=Config,dc=example,dc=com
# enable this to see trace statements when connection pool allocates new connections:
debug.ldap.pool=true
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/547b9ccd/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 5f104f9..e2b912d 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,16 +1,20 @@
#
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+# 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
#
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
-#
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
+# 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.
#
log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
@@ -28,5 +32,5 @@ log4j.logger.org.apache.wicket.version=INFO
log4j.logger.org.apache.wicket.RequestCycle=INFO
#log4j.logger.org.apache.wicket.core.util.resource.locator.ResourceStreamLocator=DEBUG
-log4j.logger.org.openldap.commander=INFO
-log4j.logger.org.openldap.fortress=INFO
\ No newline at end of file
+log4j.logger.org.apache.directory.fortress.web=INFO
+log4j.logger.org.apache.directory.fortress.core=INFO
\ No newline at end of file