portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties
Date Mon, 17 Jun 2002 21:27:05 GMT
taylor      2002/06/17 14:27:05

  Modified:    src/java/org/apache/jetspeed/modules/actions/portlets/security
                        Tag: security_14 GroupBrowserAction.java
                        GroupUpdateAction.java RoleBrowserAction.java
                        RolePermissionUpdateAction.java
                        RoleUpdateAction.java UserRoleUpdateAction.java
               src/java/org/apache/jetspeed/om/dbpsml Tag: security_14
                        JetspeedGroupProfilePeer.java
                        JetspeedRoleProfilePeer.java
               src/java/org/apache/jetspeed/om/profile Tag: security_14
                        BaseProfile.java BaseProfileLocator.java
                        ProfileLocator.java
               src/java/org/apache/jetspeed/om/security Tag: security_14
                        BaseJetspeedRole.java
               src/java/org/apache/jetspeed/services Tag: security_14
                        JetspeedSecurity.java PsmlManager.java
               src/java/org/apache/jetspeed/services/profiler Tag:
                        security_14 JetspeedProfilerService.java
               src/java/org/apache/jetspeed/services/psmlmanager Tag:
                        security_14 CastorPsmlManagerService.java
                        PsmlImporter.java PsmlManagerService.java
               src/java/org/apache/jetspeed/services/psmlmanager/db Tag:
                        security_14 DatabasePsmlManagerService.java
               src/java/org/apache/jetspeed/services/security Tag:
                        security_14 JetspeedSecurityService.java
                        RoleManagement.java
               src/java/org/apache/jetspeed/services/security/nosecurity
                        Tag: security_14 NoSecurityAccessController.java
               src/java/org/apache/jetspeed/services/security/turbine Tag:
                        security_14 TurbineRoleManagement.java
                        TurbineUserManagement.java
               webapp/WEB-INF/conf Tag: security_14
                        JetspeedSecurity.properties
  Added:       src/java/org/apache/jetspeed/om/security Tag: security_14
                        BaseJetspeedGroup.java BaseJetspeedPermission.java
                        Group.java JetspeedGroupFactory.java
                        JetspeedRoleFactory.java Permission.java
               src/java/org/apache/jetspeed/om/security/turbine Tag:
                        security_14 TurbineGroup.java
                        TurbinePermission.java
               src/java/org/apache/jetspeed/services/security Tag:
                        security_14 GroupException.java
                        GroupManagement.java JetspeedGroupManagement.java
                        JetspeedRoleManagement.java
               src/java/org/apache/jetspeed/services/security/turbine Tag:
                        security_14 TurbineGroupManagement.java
  Log:
  - Group Management implementation, further decoupling from Turbine Security.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +10 -14    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java
  
  Index: GroupBrowserAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- GroupBrowserAction.java	25 Mar 2002 21:35:23 -0000	1.3
  +++ GroupBrowserAction.java	17 Jun 2002 21:27:01 -0000	1.3.2.1
  @@ -54,6 +54,8 @@
   
   package org.apache.jetspeed.modules.actions.portlets.security;
   
  +import java.util.Iterator;
  +
   // velocity
   import org.apache.velocity.context.Context;
   
  @@ -63,18 +65,13 @@
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.DynamicURI;
   
  -// turbine om
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Group;
  -
  -// turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
  -import org.apache.turbine.util.security.UnknownEntityException;
  -import org.apache.turbine.util.security.GroupSet;
  -import org.apache.turbine.util.db.Criteria;
   
  -// jetspeed services
  +// jetspeed security
   import org.apache.jetspeed.services.JetspeedSecurity;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Group;
  +
  +// jetspeed services
   import org.apache.jetspeed.services.resources.JetspeedResources;
   
   // jetspeed velocity
  @@ -134,9 +131,8 @@
       {
           try
           {
  -            Criteria criteria = new Criteria();
  -            GroupSet groups = JetspeedSecurity.getGroups(criteria);
  -            context.put(SecurityConstants.CONTEXT_GROUPS, groups.getGroupsArray());
  +            Iterator groups = JetspeedSecurity.getGroups();
  +            context.put(SecurityConstants.CONTEXT_GROUPS, groups);
           }
           catch (Exception e)
           {
  
  
  
  1.5.2.2   +11 -11    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java
  
  Index: GroupUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- GroupUpdateAction.java	7 Jun 2002 10:02:05 -0000	1.5.2.1
  +++ GroupUpdateAction.java	17 Jun 2002 21:27:01 -0000	1.5.2.2
  @@ -63,15 +63,14 @@
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.DynamicURI;
   
  -// turbine om
  -import org.apache.turbine.om.security.Group;
  -import org.apache.turbine.om.security.User;
  -
  -// turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
  +// jetspeed security
  +import org.apache.jetspeed.services.JetspeedSecurity;
  +import org.apache.jetspeed.services.security.GroupException;
  +import org.apache.jetspeed.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedGroupFactory;
  +import org.apache.jetspeed.om.security.JetspeedUser;
   
   // jetspeed services
  -import org.apache.jetspeed.services.JetspeedSecurity;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   
   // jetspeed velocity
  @@ -207,7 +206,8 @@
               //
               // generate a new group
               //
  -            group = JetspeedSecurity.getNewGroup(name);
  +            group = JetspeedGroupFactory.getInstance();
  +            group.setName(name);
   
               //
               // add the group
  @@ -215,7 +215,7 @@
               JetspeedSecurity.addGroup(group);
   
           }
  -        catch (EntityExistsException e)
  +        catch (GroupException e)
           {
               // log the error msg
               Log.error(e);
  @@ -303,7 +303,7 @@
               //
               // remove the group
               //
  -            JetspeedSecurity.removeGroup(group);
  +            JetspeedSecurity.removeGroup(group.getName());
   
           }
           catch (Exception e)
  
  
  
  1.5.2.1   +10 -14    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java
  
  Index: RoleBrowserAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- RoleBrowserAction.java	25 Mar 2002 21:35:23 -0000	1.5
  +++ RoleBrowserAction.java	17 Jun 2002 21:27:01 -0000	1.5.2.1
  @@ -54,6 +54,8 @@
   
   package org.apache.jetspeed.modules.actions.portlets.security;
   
  +import java.util.Iterator;
  +
   // velocity
   import org.apache.velocity.context.Context;
   
  @@ -63,19 +65,14 @@
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.DynamicURI;
   
  -// turbine om
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Group;
  -
  -// turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
  -import org.apache.turbine.util.security.UnknownEntityException;
  -import org.apache.turbine.util.security.RoleSet;
  -import org.apache.turbine.util.db.Criteria;
  +
  +// jetspeed om
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.JetspeedUser;
   
   // jetspeed services
   import org.apache.jetspeed.services.JetspeedSecurity;
  +import org.apache.jetspeed.services.security.RoleException;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   
   // jetspeed velocity
  @@ -134,9 +131,8 @@
       {
           try
           {
  -            Criteria criteria = new Criteria();
  -            RoleSet roles = JetspeedSecurity.getRoles(criteria);
  -            context.put(SecurityConstants.CONTEXT_ROLES, roles.getRolesArray());
  +            Iterator roles = JetspeedSecurity.getRoles();
  +            context.put(SecurityConstants.CONTEXT_ROLES, roles);
           }
           catch (Exception e)
           {
  
  
  
  1.4.2.1   +11 -13    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java
  
  Index: RolePermissionUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RolePermissionUpdateAction.java	29 Mar 2002 20:12:32 -0000	1.4
  +++ RolePermissionUpdateAction.java	17 Jun 2002 21:27:01 -0000	1.4.2.1
  @@ -67,23 +67,19 @@
   import org.apache.turbine.util.DynamicURI;
   
   // turbine om
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.User;
   import org.apache.turbine.om.security.Permission;
   
   // turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
  -import org.apache.turbine.util.security.RoleSet;
  -import org.apache.turbine.util.security.PermissionSet;
  -import org.apache.turbine.util.db.Criteria;
   import org.apache.turbine.util.security.AccessControlList;
  -import org.apache.turbine.util.security.DataBackendException;
  -import org.apache.turbine.util.security.UnknownEntityException;
  +
  +// jetspeed om
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.JetspeedUser;
   
   // jetspeed services
   import org.apache.jetspeed.services.JetspeedSecurity;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  -
  +import org.apache.jetspeed.services.security.JetspeedSecurityException;
   // jetspeed velocity
   import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
   import org.apache.jetspeed.portal.portlets.VelocityPortlet;
  @@ -245,12 +241,12 @@
                       if (newValue == true)
                       {
                           // grant a permission to a role
  -                        JetspeedSecurity.grant( role, permissions[ix] );
  +                        // TODO - CONVERT: JetspeedSecurity.grant( role, permissions[ix] );
                       }
                       else
                       {
                           // revoke a permission from a role
  -                        JetspeedSecurity.revoke( role, permissions[ix] );
  +                        // TODO - CONVETRT: JetspeedSecurity.revoke( role, permissions[ix] );
                       }
                   }
               }
  @@ -291,8 +287,9 @@
                                               Context context,
                                               RunData rundata,
                                               String roleName)
  -        throws UnknownEntityException, DataBackendException
  +        throws JetspeedSecurityException
       {
  +        /*
           // get master list of roles
           Criteria criteria = new Criteria();
           PermissionSet master = JetspeedSecurity.getPermissions(criteria);
  @@ -328,6 +325,7 @@
           context.put(SecurityConstants.CONTEXT_PERMISSIONS, permissions);
           context.put(SecurityConstants.CONTEXT_SELECTED, selected);
           context.put(SecurityConstants.CONTEXT_ROLE, role);
  +        */
       }
   
   
  
  
  
  1.7.2.2   +12 -10    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java
  
  Index: RoleUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- RoleUpdateAction.java	7 Jun 2002 10:02:05 -0000	1.7.2.1
  +++ RoleUpdateAction.java	17 Jun 2002 21:27:01 -0000	1.7.2.2
  @@ -63,15 +63,15 @@
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.DynamicURI;
   
  -// turbine om
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.User;
  +// jetspeed om
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.BaseJetspeedRole;
  +import org.apache.jetspeed.om.security.JetspeedUser;
   
  -// turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
   
   // jetspeed services
   import org.apache.jetspeed.services.JetspeedSecurity;
  +import org.apache.jetspeed.services.security.RoleException;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   
   // jetspeed velocity
  @@ -205,8 +205,10 @@
   
               //
               // generate a new role
  -            //
  -            role = JetspeedSecurity.getNewRole(name);
  +            //            
  +            // TODO: replace with Role factory
  +            role = new BaseJetspeedRole();
  +            role.setName(name);
   
               //
               // add the role
  @@ -214,7 +216,7 @@
               JetspeedSecurity.addRole(role);
   
           }
  -        catch (EntityExistsException e)
  +        catch (RoleException e)
           {
               // log the error msg
               Log.error(e);
  @@ -302,7 +304,7 @@
               //
               // remove the role
               //
  -            JetspeedSecurity.removeRole(role);
  +            JetspeedSecurity.removeRole(role.getName());
   
           }
           catch (Exception e)
  
  
  
  1.4.2.2   +18 -19    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java
  
  Index: UserRoleUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- UserRoleUpdateAction.java	7 Jun 2002 10:02:05 -0000	1.4.2.1
  +++ UserRoleUpdateAction.java	17 Jun 2002 21:27:01 -0000	1.4.2.2
  @@ -66,21 +66,21 @@
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.DynamicURI;
   
  -// turbine om
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Group;
   
   // turbine security
  -import org.apache.turbine.util.security.EntityExistsException;
  -import org.apache.turbine.util.security.RoleSet;
  -import org.apache.turbine.util.db.Criteria;
   import org.apache.turbine.util.security.AccessControlList;
  -import org.apache.jetspeed.services.security.JetspeedSecurityException;
  +
  +// turbine om
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Group;
   
   // jetspeed services
   import org.apache.jetspeed.services.JetspeedSecurity;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  +import org.apache.jetspeed.services.security.JetspeedSecurityException;
  +import org.apache.jetspeed.services.security.RoleException;
  +
   
   // jetspeed velocity
   import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
  @@ -201,7 +201,7 @@
               return;
           }
   
  -        User user = JetspeedSecurity.getUser(entityid);
  +        JetspeedUser user = JetspeedSecurity.getUser(entityid);
           if (null == user)
           {
               Log.error("UserRoleBrowser: Failed to get user: " + entityid );
  @@ -240,16 +240,14 @@
                       if (newValue == true)
                       {
                           // grant a role to a user
  -                        JetspeedSecurity.grant( user,
  -                                                JetspeedSecurity.getGroup(JetspeedSecurity.JETSPEED_GROUP),
  -                                                roles[ix] );
  +                        JetspeedSecurity.grantRole( user.getUserName(),
  +                                                roles[ix].getName() );
                       }
                       else
                       {
                           // revoke a role from a user
  -                        JetspeedSecurity.revoke( user,
  -                                                JetspeedSecurity.getGroup(JetspeedSecurity.JETSPEED_GROUP),
  -                                                roles[ix] );
  +                        JetspeedSecurity.revokeRole( user.getUserName(),                                                
  +                                                    roles[ix].getName() );
                       }
                   }
               }
  @@ -291,12 +289,12 @@
                                          String userid)
           throws Exception
       {
  +        /*
           // get master list of roles
  -        Criteria criteria = new Criteria();
  -        RoleSet master = JetspeedSecurity.getRoles(criteria);
  +        Iterator master = JetspeedSecurity.getRoles();
   
           // get the user object
  -        User user = JetspeedSecurity.getUser(userid);
  +        JetspeedUser user = JetspeedSecurity.getUser(userid);
           if (null == user)
           {
               // no ACL found
  @@ -334,6 +332,7 @@
           context.put(SecurityConstants.CONTEXT_USER, user);
           context.put(SecurityConstants.CONTEXT_ROLES, roles);
           context.put(SecurityConstants.CONTEXT_SELECTED, selected);
  +        */
       }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java
  
  Index: JetspeedGroupProfilePeer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- JetspeedGroupProfilePeer.java	6 Apr 2002 23:41:45 -0000	1.4
  +++ JetspeedGroupProfilePeer.java	17 Jun 2002 21:27:01 -0000	1.4.2.1
  @@ -7,9 +7,8 @@
   import com.workingdogs.village.*;
   
   // Turbine classes
  -import org.apache.turbine.om.security.*;
  -import org.apache.turbine.om.peer.*;
  -import org.apache.turbine.util.*;
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.Log;
   
   //Torque classes
   import org.apache.torque.util.Criteria;
  @@ -18,6 +17,7 @@
   // Local classes
   import org.apache.jetspeed.om.dbpsml.map.*;
   
  +import org.apache.jetspeed.om.security.Group;
   import org.apache.jetspeed.om.profile.Profile;
   import org.apache.jetspeed.om.profile.ProfileLocator;
   import org.apache.jetspeed.services.psmlmanager.db.DBOperations;
  
  
  
  1.4.2.1   +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java
  
  Index: JetspeedRoleProfilePeer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- JetspeedRoleProfilePeer.java	6 Apr 2002 23:41:46 -0000	1.4
  +++ JetspeedRoleProfilePeer.java	17 Jun 2002 21:27:01 -0000	1.4.2.1
  @@ -7,9 +7,8 @@
   import com.workingdogs.village.*;
   
   // Turbine classes
  -import org.apache.turbine.om.security.*;
  -import org.apache.turbine.om.peer.*;
  -import org.apache.turbine.util.*;
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.Log;
   
   //Torque classes
   import org.apache.torque.util.Criteria;
  @@ -18,6 +17,7 @@
   // Local classes
   import org.apache.jetspeed.om.dbpsml.map.*;
   
  +import org.apache.jetspeed.om.security.Role;
   import org.apache.jetspeed.om.profile.Profile;
   import org.apache.jetspeed.om.profile.ProfileLocator;
   import org.apache.jetspeed.services.psmlmanager.db.DBOperations;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.1  +4 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java
  
  Index: BaseProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- BaseProfile.java	1 May 2002 04:32:22 -0000	1.13
  +++ BaseProfile.java	17 Jun 2002 21:27:02 -0000	1.13.2.1
  @@ -61,9 +61,9 @@
   import org.apache.jetspeed.services.PsmlManager;
   
   import org.apache.jetspeed.portal.Portlet;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   
   /**
   Provides base functionality within a Registry.
  
  
  
  1.11.2.2  +12 -11    jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java
  
  Index: BaseProfileLocator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- BaseProfileLocator.java	30 May 2002 07:04:10 -0000	1.11.2.1
  +++ BaseProfileLocator.java	17 Jun 2002 21:27:02 -0000	1.11.2.2
  @@ -55,19 +55,20 @@
   package org.apache.jetspeed.om.profile;
   
   import java.util.StringTokenizer;
  +
   import org.apache.turbine.util.Log;
  -import org.apache.turbine.om.security.User;
  +import org.apache.turbine.services.TurbineServices;
  +import org.apache.turbine.services.ServiceBroker;
  +
  +import org.apache.jetspeed.om.security.JetspeedUser;
   import org.apache.jetspeed.om.security.JetspeedUserFactory;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  -import org.apache.turbine.util.security.UnknownEntityException;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   
   import org.apache.jetspeed.services.security.UserException;
   import org.apache.jetspeed.om.security.JetspeedUser;
   import org.apache.jetspeed.services.Profiler;
   import org.apache.jetspeed.services.JetspeedSecurity;
  -import org.apache.turbine.services.TurbineServices;
  -import org.apache.turbine.services.ServiceBroker;
   
   
   /**
  @@ -88,7 +89,7 @@
       private String mediaType = null;
       private String language = null;
       private String country = null;
  -    private User   user = null;
  +    private JetspeedUser user = null;
       private Role   role = null;
       private Group  group = null;
       private boolean anonymous = false;
  @@ -375,7 +376,7 @@
        *
        * @return The user parameter for this profile.
        */
  -    public User getUser()
  +    public JetspeedUser getUser()
       {
           return user;
       }
  @@ -393,7 +394,7 @@
        *
        * @param The user parameter for this profile.
        */
  -    public void setUser(User user)
  +    public void setUser(JetspeedUser user)
       {
           this.user = user;
       }
  @@ -533,7 +534,7 @@
        */
       private boolean userEquals(ProfileLocator locator)
       {
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
           // if either of reference is null return false.
           if (exclusiveOr(this.user, user)) 
           {
  
  
  
  1.5.2.1   +6 -6      jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ProfileLocator.java
  
  Index: ProfileLocator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ProfileLocator.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ProfileLocator.java	20 Apr 2002 12:48:04 -0000	1.5
  +++ ProfileLocator.java	17 Jun 2002 21:27:02 -0000	1.5.2.1
  @@ -54,9 +54,9 @@
   
   package org.apache.jetspeed.om.profile;
   
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   
   /**
    * Interface definition for a Profile Locator.
  @@ -166,7 +166,7 @@
        *
        * @return The user parameter for this profile.
        */
  -    User getUser();
  +    JetspeedUser getUser();
   
       String getUserName();
   
  @@ -175,7 +175,7 @@
        *
        * @param user The user parameter for this profile.
        */
  -    void setUser(User user);
  +    void setUser(JetspeedUser user);
   
       /*
        * Gets the anonymous user flag for this profile.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +15 -1     jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/BaseJetspeedRole.java
  
  Index: BaseJetspeedRole.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/BaseJetspeedRole.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- BaseJetspeedRole.java	14 Jun 2002 06:00:09 -0000	1.1.2.1
  +++ BaseJetspeedRole.java	17 Jun 2002 21:27:02 -0000	1.1.2.2
  @@ -65,13 +65,17 @@
       protected String name;
       protected String id = null;
   
  +    protected boolean isNew = true;
  +
       public BaseJetspeedRole(String id)
       {
           this.id = id;
  +        isNew = true;
       }
   
       public BaseJetspeedRole()
       {
  +        isNew = true;
       }
   
       /**
  @@ -115,6 +119,16 @@
           {
               this.id = id;
           }
  +    }
  +
  +    public boolean isNew()
  +    {
  +        return isNew;
  +    }
  +
  +    void setNew(boolean isNew)
  +    {
  +        this.isNew = isNew;
       }
   
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +137 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/BaseJetspeedGroup.java
  
  
  
  
  1.1.2.1   +124 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/BaseJetspeedPermission.java
  
  
  
  
  1.1.2.1   +95 -0     jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/Group.java
  
  
  
  
  1.1.2.1   +135 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/JetspeedGroupFactory.java
  
  
  
  
  1.1.2.1   +134 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/JetspeedRoleFactory.java
  
  
  
  
  1.1.2.1   +95 -0     jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/Attic/Permission.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +38 -0     jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/Attic/TurbineGroup.java
  
  
  
  
  1.1.2.1   +39 -0     jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/turbine/Attic/TurbinePermission.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.10 +197 -166  jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java
  
  Index: JetspeedSecurity.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java,v
  retrieving revision 1.10.2.9
  retrieving revision 1.10.2.10
  diff -u -r1.10.2.9 -r1.10.2.10
  --- JetspeedSecurity.java	14 Jun 2002 06:00:10 -0000	1.10.2.9
  +++ JetspeedSecurity.java	17 Jun 2002 21:27:02 -0000	1.10.2.10
  @@ -57,33 +57,35 @@
   import java.util.Iterator;
   import java.security.Principal;
   
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Group;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Permission;
  +import org.apache.turbine.services.TurbineServices;
  +import org.apache.turbine.util.Log;
  +import org.apache.turbine.services.rundata.RunDataService;
  +
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Group;
  +import org.apache.jetspeed.om.security.Role;
  +//import org.apache.jetspeed.om.security.Permission;
   import org.apache.jetspeed.om.profile.Profile;
   import org.apache.jetspeed.om.profile.BaseProfile;
   import org.apache.jetspeed.services.Profiler;
   import org.apache.jetspeed.services.PsmlManager;
   import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
  -import org.apache.turbine.services.rundata.RunDataService;
  -
  -import org.apache.turbine.util.Log;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
  -import org.apache.turbine.services.TurbineServices;
  -
   import org.apache.jetspeed.portal.Portlet;
   
   import org.apache.jetspeed.om.profile.Entry;
   import org.apache.jetspeed.om.profile.ProfileException;
   import org.apache.jetspeed.om.registry.RegistryEntry;
  -import org.apache.jetspeed.om.security.JetspeedUser;
   import org.apache.jetspeed.om.security.JetspeedUserFactory;
   import org.apache.jetspeed.om.security.UserNamePrincipal;
   
   import org.apache.jetspeed.services.JetspeedPortalAccessController;
   import org.apache.jetspeed.services.JetspeedUserManagement;
   import org.apache.jetspeed.services.JetspeedAuthentication;
  +import org.apache.jetspeed.services.security.JetspeedRoleManagement;
  +import org.apache.jetspeed.services.security.RoleManagement;
  +import org.apache.jetspeed.services.security.JetspeedGroupManagement;
  +import org.apache.jetspeed.services.security.GroupManagement;
   
   import org.apache.jetspeed.services.security.JetspeedSecurityService;
   import org.apache.jetspeed.services.security.JetspeedSecurityException;
  @@ -91,6 +93,11 @@
   import org.apache.jetspeed.services.security.LoginException;
   
   
  +// DELETE ME: transitional -- soon to go
  +import org.apache.turbine.om.security.User;
  +import org.apache.turbine.om.security.Permission;
  +import org.apache.turbine.services.security.TurbineSecurity;
  +
   /**
    * <P>This is a commodity static accessor class around the 
    * <code>JetspeedSecurityService</code></P>
  @@ -259,7 +266,7 @@
       }
   
       /**
  -     * 
  +     * @see UserManagement#getUser
        */    
       public static JetspeedUser getUser(String username) 
           throws JetspeedSecurityException
  @@ -268,7 +275,7 @@
       }
   
       /**
  -     * 
  +     * @see UserManagement#removeUser
        */    
       public static void removeUser(String username)
           throws JetspeedSecurityException
  @@ -311,6 +318,181 @@
           return JetspeedUserManagement.encryptPassword(password);
       }
        
  +
  +    //////////////////////////////////////////////////////////////////////////
  +    // Role Management
  +    /////////////////////////////////////////////////////////////////////////
  +
  +
  +    /**
  +     * @see RoleManagement#getRoles(String)
  +     */    
  +    public static Iterator getRoles(String username)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedRoleManagement.getRoles(username);
  +    }
  +
  +    /**
  +     * @see RoleManagement#getRoles
  +     */    
  +    public static Iterator getRoles()
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedRoleManagement.getRoles();
  +    }
  +
  +    /**
  +     * @see RoleManagement#addRole
  +     */    
  +    public static void addRole(Role role)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedRoleManagement.addRole(role);
  +    }
  +
  +    /**
  +     * @see RoleManagement#saveRole
  +     */    
  +    public static void saveRole(Role role)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedRoleManagement.saveRole(role);
  +    }
  +
  +    /**
  +     * @see RoleManagement#removeRole
  +     */    
  +    public static void removeRole(String rolename)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedRoleManagement.removeRole(rolename);
  +    }
  +
  +    /**
  +     * @see RoleManagement#grantRole
  +     */    
  +    public static void grantRole(String username, String rolename)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedRoleManagement.grantRole(username,rolename);
  +    }
  +
  +    /**
  +     * @see RoleManagement#revokeRole
  +     */    
  +    public static void revokeRole(String username, String rolename)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedRoleManagement.revokeRole(username,rolename);
  +    }
  +
  +    /**
  +     * @see RoleManagement#hasRole
  +     */    
  +    public static boolean hasRole(String username, String rolename)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedRoleManagement.hasRole(username,rolename);
  +    }
  +
  +    /**
  +     * @see RoleManagement#getRole
  +     */    
  +    public static Role getRole(String rolename)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedRoleManagement.getRole(rolename);
  +    }
  +        
  +
  +    //////////////////////////////////////////////////////////////////////////
  +    // Group Management
  +    /////////////////////////////////////////////////////////////////////////
  +
  +
  +    /**
  +     * @see GroupManagement#getGroups(String)
  +     */    
  +    public static Iterator getGroups(String username)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedGroupManagement.getGroups(username);
  +    }
  +
  +    /**
  +     * @see GroupManagement#getGroups
  +     */    
  +    public static Iterator getGroups()
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedGroupManagement.getGroups();
  +    }
  +
  +    /**
  +     * @see GroupManagement#addGroup
  +     */    
  +    public static void addGroup(Group group)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedGroupManagement.addGroup(group);
  +    }
  +
  +    /**
  +     * @see GroupManagement#saveGroup
  +     */    
  +    public static void saveGroup(Group group)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedGroupManagement.saveGroup(group);
  +    }
  +
  +    /**
  +     * @see GroupManagement#removeGroup
  +     */    
  +    public static void removeGroup(String groupname)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedGroupManagement.removeGroup(groupname);
  +    }
  +
  +    /**
  +     * @see GroupManagement#joinGroup
  +     */    
  +    public static void joinGroup(String username, String groupname)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedGroupManagement.joinGroup(username,groupname);
  +    }
  +
  +    /**
  +     * @see GroupManagement#revokeGroup
  +     */    
  +    public static void unjoinGroup(String username, String groupname)
  +        throws JetspeedSecurityException
  +    {
  +        JetspeedGroupManagement.unjoinGroup(username,groupname);
  +    }
  +
  +    /**
  +     * @see GroupManagement#inGroup
  +     */    
  +    public static boolean inGroup(String username, String groupname)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedGroupManagement.inGroup(username,groupname);
  +    }
  +
  +    /**
  +     * @see GroupManagement#getGroup
  +     */    
  +    public static Group getGroup(String groupname)
  +        throws JetspeedSecurityException
  +    {
  +        return JetspeedGroupManagement.getGroup(groupname);
  +    }
  +
  +
       //////////////////////////////////////////////////////////////////////////
       //
       // Required JetspeedSecurity Functions
  @@ -407,94 +589,7 @@
       //////////////////////////////////////////////////////////////////////////
   
   
  -    public static void addGroup( Group group )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.EntityExistsException
  -    {
  -       org.apache.turbine.services.security.TurbineSecurity.addGroup(group);
  -        try
  -        {
  -            JetspeedRunDataService runDataService =
  -               (JetspeedRunDataService)TurbineServices.getInstance()
  -                   .getService(RunDataService.SERVICE_NAME);
  -            JetspeedRunData rundata = runDataService.getCurrentRunData();            
  -            Profile profile = new BaseProfile();
  -            profile.setGroup(group);
  -            profile.setMediaType("html");
  -            Profiler.createProfile(rundata, profile);
  -        }
  -        catch (ProfileException e)
  -        {
  -            try
  -            {
  -                removeGroup(group);
  -            }
  -            catch(Exception e2)
  -            {
  -            }
  -            throw new org.apache.turbine.util.security.DataBackendException("Failed to create Group PSML", e);
  -        }
  -
  -    }
  -    
  -    public static void removeGroup( Group group )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -           org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        PsmlManager.removeGroupDocuments(group);
  -        org.apache.turbine.services.security.TurbineSecurity.removeGroup(group);
  -    }
  -    
  -    public static void addRole(Role role)
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.EntityExistsException
  -    {
  -       org.apache.turbine.services.security.TurbineSecurity.addRole(role);
  -        try
  -        {
  -            JetspeedRunDataService runDataService =
  -               (JetspeedRunDataService)TurbineServices.getInstance()
  -                   .getService(RunDataService.SERVICE_NAME);
  -            JetspeedRunData rundata = runDataService.getCurrentRunData();
  -            Profile profile = new BaseProfile();
  -            profile.setRole(role);
  -            profile.setMediaType("html");
  -            Profiler.createProfile(rundata, profile);
  -        }
  -        catch (ProfileException e)
  -        {
  -            try
  -            {
  -                removeRole(role);
  -            }
  -            catch(Exception e2)
  -            {
  -            }
  -            throw new org.apache.turbine.util.security.DataBackendException("Failed to create Role PSML", e);
  -        }
  -    }
  -    
  -    public static void removeRole(Role role)
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -           org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        PsmlManager.removeRoleDocuments(role);
  -        org.apache.turbine.services.security.TurbineSecurity.removeRole(role);
  -                                            
  -    }
       
  -    public static Role getNewRole( String roleName )
  -        throws org.apache.turbine.util.security.TurbineSecurityException
  -    {
  -       return org.apache.turbine.services.security.TurbineSecurity.getNewRole(roleName);
  -    }
  -
  -
  -    public static org.apache.turbine.util.security.RoleSet getRoles( org.apache.turbine.util.db.Criteria criteria )
  -    throws org.apache.turbine.util.security.DataBackendException
  -    {
  -       return org.apache.turbine.services.security.TurbineSecurity.getRoles(criteria);
  -    }
       
       public static org.apache.turbine.util.security.AccessControlList getACL( User user ) 
          throws org.apache.turbine.util.security.DataBackendException, 
  @@ -504,25 +599,6 @@
           //return org.apache.turbine.services.security.TurbineSecurity.getACL(user);
       }
       
  -    public static org.apache.turbine.om.security.Role getRole( String roleName )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -          org.apache.turbine.util.security.UnknownEntityException
  -    {
  -       return org.apache.turbine.services.security.TurbineSecurity.getRole(roleName);
  -    }
  -
  -    public static Group getGroup( String groupName )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -    return org.apache.turbine.services.security.TurbineSecurity.getGroup(groupName);
  -    }
  -
  -    public static org.apache.turbine.util.security.GroupSet getGroups( org.apache.turbine.util.db.Criteria criteria )
  -    throws org.apache.turbine.util.security.DataBackendException
  -    {
  -       return org.apache.turbine.services.security.TurbineSecurity.getGroups(criteria);
  -    }
   
       public static org.apache.turbine.util.security.PermissionSet getPermissions( org.apache.turbine.util.db.Criteria criteria )
       throws org.apache.turbine.util.security.DataBackendException
  @@ -534,28 +610,11 @@
       throws org.apache.turbine.util.security.DataBackendException, 
            org.apache.turbine.util.security.UnknownEntityException
       {
  -        return org.apache.turbine.services.security.TurbineSecurity.getPermissions(role);
  -    }
  -
  -    public static Group getNewGroup( String groupName )
  -    throws org.apache.turbine.util.security.DataBackendException
  -    {
  -        return org.apache.turbine.services.security.TurbineSecurity.getNewGroup(groupName);    
  +        return null;
  +        // return org.apache.turbine.services.security.TurbineSecurity.getPermissions(role);
       }
   
  -    public static void saveGroup( Group group )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        org.apache.turbine.services.security.TurbineSecurity.saveGroup(group);    
  -    }
   
  -    public static void saveRole( Role role )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        org.apache.turbine.services.security.TurbineSecurity.saveRole(role);    
  -    }
   
       public static Permission getPermission( String permissionName )
       throws org.apache.turbine.util.security.DataBackendException, 
  @@ -590,34 +649,6 @@
           org.apache.turbine.services.security.TurbineSecurity.removePermission(permission);
                                               
       }
  -
  -    public static void grant( User user, Group group, Role role )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        org.apache.turbine.services.security.TurbineSecurity.grant(user, group, role);
  -    }
  -
  -    public static void grant( Role role, Permission permission )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        org.apache.turbine.services.security.TurbineSecurity.grant(role, permission);
  -    }
  -
  -    public static void revoke( Role role, Permission permission )
  -    throws org.apache.turbine.util.security.DataBackendException, 
  -         org.apache.turbine.util.security.UnknownEntityException
  -    {
  -        org.apache.turbine.services.security.TurbineSecurity.revoke(role, permission);
  -    }
  -
  -    public static void revoke( User user, Group group, Role role )
  -     throws org.apache.turbine.util.security.DataBackendException, 
  -          org.apache.turbine.util.security.UnknownEntityException
  -     {
  -         org.apache.turbine.services.security.TurbineSecurity.revoke(user, group, role);
  -     }
   
   
   }
  
  
  
  1.7.2.1   +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/PsmlManager.java
  
  Index: PsmlManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/PsmlManager.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- PsmlManager.java	20 Nov 2001 05:32:21 -0000	1.7
  +++ PsmlManager.java	17 Jun 2002 21:27:03 -0000	1.7.2.1
  @@ -60,9 +60,9 @@
   import org.apache.jetspeed.om.profile.ProfileLocator;
   import org.apache.jetspeed.om.profile.QueryLocator;
   import org.apache.jetspeed.om.profile.Profile;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   
   import java.util.Iterator;
   import java.util.List;
  @@ -174,7 +174,7 @@
        *
        * @param user The user object.
        */
  -    public static void removeUserDocuments( User user )
  +    public static void removeUserDocuments( JetspeedUser user )
       {
           getService().removeUserDocuments( user );
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.3  +22 -26    jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.29.2.2
  retrieving revision 1.29.2.3
  diff -u -r1.29.2.2 -r1.29.2.3
  --- JetspeedProfilerService.java	26 May 2002 01:37:10 -0000	1.29.2.2
  +++ JetspeedProfilerService.java	17 Jun 2002 21:27:03 -0000	1.29.2.3
  @@ -86,13 +86,12 @@
   import org.apache.turbine.util.security.DataBackendException;
   import org.apache.turbine.util.security.AccessControlList;
   
  -// turbine.om
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  -import org.apache.turbine.util.security.RoleSet;
   
   // jetspeed.om
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
  +
   import org.apache.jetspeed.om.profile.*;
   import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
   import org.apache.jetspeed.om.registry.RegistryException;
  @@ -271,33 +270,29 @@
        * @param cm the <code>CapabilityMap</code> of the current requesting device
        * @return a new Profile object
        */
  -    public Profile getProfile(RunData rundata, CapabilityMap cm)
  +    public Profile getProfile(RunData data, CapabilityMap cm)
           throws ProfileException
       {
  +        JetspeedRunData rundata = (JetspeedRunData)data;
           Profile profile = fallbackProfile(rundata, cm);
           if (null == profile && useRoleFallback) 
           {
  -            User user = rundata.getUser();
  +            JetspeedUser user = rundata.getJetspeedUser();
               if (user != null)
               {
                   try
                   {
  -                    AccessControlList acl = rundata.getACL();
  -                    if (acl != null)
  +                    Iterator roles = JetspeedSecurity.getRoles(user.getName());
  +                    if (roles != null)
                       {
  -                        RoleSet roles = acl.getRoles(JetspeedSecurity.getGroup(JetspeedSecurity.JETSPEED_GROUP)); 
  -                        if (roles != null)
  +                        while (roles.hasNext())
                           {
  -                            Iterator it = roles.elements();
  -                            while (it.hasNext())
  -                            {
  -                                // note: this is an unordered list. will need to change db schema to order it
  -                                Role role = (Role)it.next();
  -                                rundata.getParameters().setString( Profiler.PARAM_ROLE, role.getName() );
  -                                profile = fallbackProfile(rundata, cm);
  -                                if (profile != null)
  -                                    break;
  -                            }
  +                            // note: this is an unordered list. will need to change db schema to order it
  +                            Role role = (Role)roles.next();
  +                            rundata.getParameters().setString( Profiler.PARAM_ROLE, role.getName() );
  +                            profile = fallbackProfile(rundata, cm);
  +                            if (profile != null)
  +                                break;
                           }
                       }
                   }
  @@ -318,13 +313,14 @@
        * @param cm the <code>CapabilityMap</code> of the current requesting device
        * @return a new Profile object
        */
  -    protected Profile fallbackProfile(RunData rundata, CapabilityMap cm)
  +    protected Profile fallbackProfile(RunData data, CapabilityMap cm)
           throws ProfileException
       {
           try
           {
  +            JetspeedRunData rundata = (JetspeedRunData)data;
               Profile profile = new BaseProfile();
  -            User user = rundata.getUser();
  +            JetspeedUser user = rundata.getJetspeedUser();
        
               // get the media type from the capability map or rundata
               profile.setMediaType(getMediaType(rundata, cm));
  @@ -366,7 +362,7 @@
                           // is it a anonymous access?
                           if (user.hasLoggedIn())
                           {
  -                            profile.setUser( rundata.getUser() );
  +                            profile.setUser( rundata.getJetspeedUser() );
                           }
                           else  // anonymous
                           {
  @@ -733,7 +729,7 @@
           DynamicURI uri = new DynamicURI( data );
   
           // check User, Group or Role to add to the uri
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
           if (null != user)
           {
               if (user.getUserName() != null)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.2  +15 -18    jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
  
  Index: CastorPsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
  retrieving revision 1.23.2.1
  retrieving revision 1.23.2.2
  diff -u -r1.23.2.1 -r1.23.2.2
  --- CastorPsmlManagerService.java	30 May 2002 07:04:10 -0000	1.23.2.1
  +++ CastorPsmlManagerService.java	17 Jun 2002 21:27:03 -0000	1.23.2.2
  @@ -75,10 +75,11 @@
   import org.apache.turbine.services.servlet.TurbineServlet;
   import org.apache.turbine.services.resources.ResourceService;
   
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  -
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.JetspeedRoleFactory;
  +import org.apache.jetspeed.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedGroupFactory;
   import org.apache.jetspeed.om.security.JetspeedUser;
   import org.apache.jetspeed.om.security.JetspeedUserFactory;
   
  @@ -847,7 +848,7 @@
        *
        * @param user The user object.
        */
  -    public void removeUserDocuments( User user )
  +    public void removeUserDocuments( JetspeedUser user )
       {
           ProfileLocator locator = new BaseProfileLocator();
           locator.setUser(user);
  @@ -880,7 +881,7 @@
                   Profile profile = (Profile)ref.get();
                   if (null == profile)
                       continue;
  -                User pUser = profile.getUser();
  +                JetspeedUser pUser = profile.getUser();
                   if (null != pUser && pUser.getUserName().equals(user.getUserName()))
                   {
                       documents.remove(profile.getDocument().getName());
  @@ -997,7 +998,7 @@
           // move the base dir is either user or role is specified
           Role role = locator.getRole();
           Group group = locator.getGroup();
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
   
           // Is it an anonymous, user, group, or role resource?
           if (locator.getAnonymous())
  @@ -1097,7 +1098,7 @@
   
           Role role = locator.getRole();
           Group group = locator.getGroup();
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
       
           // search thru anonymous directories?
           int qm = locator.getQueryMode();
  @@ -1319,10 +1320,8 @@
                           Role role = qs.profile.getRole();
                           if (null == role)
                           {
  -                            // warning: this ties us to turbine security
  -                            // we could load class from TRP 
  -                            // (services.SecurityService.user.class)
  -                            role = new TurbineRole(file.getName());
  +                            role = JetspeedRoleFactory.getInstance();
  +                            role.setName(file.getName());
                               qs.profile.setRole(role);
                               qs.clearName = true;
                           }
  @@ -1332,10 +1331,8 @@
                           Group group = qs.profile.getGroup();
                           if (null == group)
                           {
  -                            // warning: this ties us to turbine security
  -                            // we could load class from TRP 
  -                            // (services.SecurityService.user.class)
  -                            group = new TurbineGroup(file.getName());
  +                            group = JetspeedGroupFactory.getInstance();
  +                            group.setName(file.getName());
                               qs.profile.setGroup(group);
                               qs.clearName = true;
                           }
  @@ -1512,7 +1509,7 @@
   
       private void dumpProfile(Profile profile)
       {
  -        User user = profile.getUser();
  +        JetspeedUser user = profile.getUser();
           Group group = profile.getGroup();
           Role role = profile.getRole();
           if (profile.getAnonymous() == true)
  
  
  
  1.8.2.2   +6 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java
  
  Index: PsmlImporter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlImporter.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- PsmlImporter.java	7 Jun 2002 10:02:06 -0000	1.8.2.1
  +++ PsmlImporter.java	17 Jun 2002 21:27:03 -0000	1.8.2.2
  @@ -56,18 +56,17 @@
   
   import java.util.Iterator;
   
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
   import org.apache.turbine.services.TurbineServices;
   
  -
   import org.apache.jetspeed.services.psmlmanager.db.DatabasePsmlManagerService;
   
   // Jetspeed Security service
   import org.apache.jetspeed.services.JetspeedSecurity;
   import org.apache.jetspeed.services.security.JetspeedSecurityException;
   import org.apache.jetspeed.services.security.UnknownUserException;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   
   // Profile and ProfileLocator interface 
   import org.apache.jetspeed.om.profile.Profile;
  @@ -135,7 +134,7 @@
   
       private void dumpProfile(Profile profile)
       {
  -        User user = profile.getUser();
  +        JetspeedUser user = profile.getUser();
           Group group = profile.getGroup();
           Role role = profile.getRole();
           if (profile.getAnonymous() == true)
  @@ -159,7 +158,7 @@
           {
               // dst: why not get a count(*) from ANON table?
   
  -            User user = JetspeedSecurity.getUser("admin");
  +            JetspeedUser user = JetspeedSecurity.getUser("admin");
               QueryLocator ql = new QueryLocator(QueryLocator.QUERY_USER);
               ql.setUser(user);
               Iterator iterator = PsmlManager.query(ql);
  
  
  
  1.8.2.1   +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlManagerService.java
  
  Index: PsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/PsmlManagerService.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- PsmlManagerService.java	20 Nov 2001 05:01:22 -0000	1.8
  +++ PsmlManagerService.java	17 Jun 2002 21:27:03 -0000	1.8.2.1
  @@ -61,9 +61,9 @@
   import org.apache.jetspeed.om.profile.ProfileLocator;
   import org.apache.jetspeed.om.profile.QueryLocator;
   import org.apache.jetspeed.om.profile.Profile;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
   import org.apache.turbine.services.InitializationException;
   
   /**
  @@ -145,7 +145,7 @@
        *
        * @param user The user object.
        */
  -    public void removeUserDocuments( User user );
  +    public void removeUserDocuments( JetspeedUser user );
   
       /** Removes all documents for a given group.
        *
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.1  +12 -11    jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
  
  Index: DatabasePsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- DatabasePsmlManagerService.java	6 Apr 2002 23:41:46 -0000	1.15
  +++ DatabasePsmlManagerService.java	17 Jun 2002 21:27:03 -0000	1.15.2.1
  @@ -78,13 +78,14 @@
   import org.apache.turbine.services.InitializationException;
   import org.apache.turbine.services.TurbineServices;
   import org.apache.turbine.services.resources.ResourceService;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Group;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.util.db.pool.DBConnection;
  -import org.apache.turbine.services.db.TurbineDB; 
   import org.apache.turbine.services.servlet.TurbineServlet;
   
  +// jetspeed security
  +import org.apache.jetspeed.om.security.JetspeedUser;
  +import org.apache.jetspeed.om.security.Role;
  +import org.apache.jetspeed.om.security.Group;
  +
  +
   //Servlet API
   import javax.servlet.ServletConfig;
    
  @@ -354,7 +355,7 @@
       {
           StringBuffer keybuf = new StringBuffer();
    
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
           Role role = locator.getRole();
           Group group = locator.getGroup();
           boolean anonymous = locator.getAnonymous();
  @@ -566,7 +567,7 @@
               throw new IllegalArgumentException(message);
           }
   
  -        User user = profile.getUser();
  +        JetspeedUser user = profile.getUser();
           Role role = profile.getRole();
           Group group = profile.getGroup();
           boolean anonymous = profile.getAnonymous();
  @@ -653,7 +654,7 @@
               throw new IllegalArgumentException(message);
           }
   
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
           Role role = locator.getRole();
           Group group = locator.getGroup();
           String tableName = null;
  @@ -898,7 +899,7 @@
               throw new IllegalArgumentException(message);
           }
   
  -        User user = locator.getUser();
  +        JetspeedUser user = locator.getUser();
           Role role = locator.getRole();
           Group group = locator.getGroup();
           String tableName = null;
  @@ -989,7 +990,7 @@
        *
        * @param user The user object.
        */
  -    public void removeUserDocuments(User user)
  +    public void removeUserDocuments(JetspeedUser user)
       {
           try 
           {  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.3   +1 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedSecurityService.java
  
  Index: JetspeedSecurityService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedSecurityService.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- JetspeedSecurityService.java	7 Jun 2002 10:02:06 -0000	1.7.2.2
  +++ JetspeedSecurityService.java	17 Jun 2002 21:27:04 -0000	1.7.2.3
  @@ -55,10 +55,6 @@
   
   package org.apache.jetspeed.services.security;
   
  -import org.apache.turbine.services.security.SecurityService;
  -import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.om.security.Group;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.turbine.services.Service;
   
  
  
  
  1.1.2.3   +15 -3     jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/RoleManagement.java
  
  Index: RoleManagement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/RoleManagement.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- RoleManagement.java	14 Jun 2002 06:00:10 -0000	1.1.2.2
  +++ RoleManagement.java	17 Jun 2002 21:27:04 -0000	1.1.2.3
  @@ -109,11 +109,23 @@
        * to determine if the requestor has permission to perform this action.
        *
        * @exception RoleException when the security provider has a general failure.
  -     * @exception NotUniqueEntityException when the public credentials fail to meet 
  -     *                                   the security provider-specific unique constraints.
        * @exception InsufficientPrivilegeException when the requestor is denied due to insufficient privilege 
        */
       void addRole(Role role)
  +        throws JetspeedSecurityException;
  +
  +    /**
  +     * Saves a <code>Role</code> into permanent storage. 
  +     *
  +     * The security service can throw a <code>NotUniqueEntityException</code> when the public
  +     * credentials fail to meet the security provider-specific unique constraints.
  +     * The security service may optionally check the current user context
  +     * to determine if the requestor has permission to perform this action.
  +     *
  +     * @exception RoleException when the security provider has a general failure.
  +     * @exception InsufficientPrivilegeException when the requestor is denied due to insufficient privilege 
  +     */
  +    void saveRole(Role role)
           throws JetspeedSecurityException;
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +101 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/GroupException.java
  
  
  
  
  1.1.2.1   +204 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/GroupManagement.java
  
  
  
  
  1.1.2.1   +244 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/JetspeedGroupManagement.java
  
  
  
  
  1.1.2.1   +245 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/JetspeedRoleManagement.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/Attic/NoSecurityAccessController.java
  
  Index: NoSecurityAccessController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/nosecurity/Attic/NoSecurityAccessController.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- NoSecurityAccessController.java	14 Jun 2002 06:43:58 -0000	1.1.2.1
  +++ NoSecurityAccessController.java	17 Jun 2002 21:27:04 -0000	1.1.2.2
  @@ -96,7 +96,7 @@
        * @param action the secured action to be performed on the resource by the user.
        * @return boolean true if the user has sufficient privilege.
        */
  -    public boolean checkPermission(JetspeedUser user, int resourceType, String resource, String action)
  +    final public boolean checkPermission(JetspeedUser user, int resourceType, String resource, String action)
       {
           return true;
       }
  @@ -112,7 +112,7 @@
        * @param action the secured action to be performed on the resource by the user.
        * @return boolean true if the user has sufficient privilege.
        */
  -    public boolean checkPermission(JetspeedUser user, Portlet portlet, String action)
  +    final public boolean checkPermission(JetspeedUser user, Portlet portlet, String action)
       {
           return true;
       }
  @@ -128,7 +128,7 @@
        * @param action the secured action to be performed on the resource by the user.
        * @return boolean true if the user has sufficient privilege.
        */
  -    public boolean checkPermission(JetspeedUser user, Entry entry, String action)
  +    final public boolean checkPermission(JetspeedUser user, Entry entry, String action)
       {
           return true;
       }
  @@ -145,7 +145,7 @@
        * @param action the secured action to be performed on the resource by the user.
        * @return boolean true if the user has sufficient privilege.
        */
  -    public boolean checkPermission(JetspeedUser user, PortalResource resource, String action)
  +    final public boolean checkPermission(JetspeedUser user, PortalResource resource, String action)
       {
           return true;
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +75 -2     jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineRoleManagement.java
  
  Index: TurbineRoleManagement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineRoleManagement.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TurbineRoleManagement.java	14 Jun 2002 06:00:11 -0000	1.1.2.1
  +++ TurbineRoleManagement.java	17 Jun 2002 21:27:04 -0000	1.1.2.2
  @@ -85,6 +85,12 @@
   import org.apache.jetspeed.om.security.turbine.TurbineUserGroupRole;
   import org.apache.jetspeed.om.security.turbine.TurbineUserGroupRolePeer;
   
  +// Profile
  +import org.apache.jetspeed.om.profile.Profile;
  +import org.apache.jetspeed.om.profile.BaseProfile;
  +import org.apache.jetspeed.services.Profiler;
  +import org.apache.jetspeed.om.profile.ProfileException;
  +
   // Torque
   import org.apache.torque.util.Criteria;
   import org.apache.torque.om.NumberKey;
  @@ -233,7 +239,74 @@
                   role.getName() + "'", e);
           }
   
  -        //addDefaultRolePSML(role);
  +        addDefaultRolePSML(role);
  +
  +    }
  +
  +    protected void addDefaultRolePSML(Role role)
  +        throws RoleException
  +    {
  +        try
  +        {
  +            JetspeedRunDataService runDataService =
  +               (JetspeedRunDataService)TurbineServices.getInstance()
  +                   .getService(RunDataService.SERVICE_NAME);
  +            JetspeedRunData rundata = runDataService.getCurrentRunData();
  +            Profile profile = new BaseProfile();
  +            profile.setRole(role);
  +            profile.setMediaType("html");
  +            Profiler.createProfile(rundata, profile);
  +        }
  +        catch (ProfileException e)
  +        {
  +            try
  +            {
  +                removeRole(role.getName());
  +            }
  +            catch(Exception e2)
  +            {
  +            }
  +            throw new RoleException("Failed to create Role PSML", e);
  +        }
  +    }
  +
  +    /**
  +     * Saves a <code>Role</code> into permanent storage. 
  +     *
  +     * The security service can throw a <code>NotUniqueEntityException</code> when the public
  +     * credentials fail to meet the security provider-specific unique constraints.
  +     * The security service may optionally check the current user context
  +     * to determine if the requestor has permission to perform this action.
  +     *
  +     * @exception RoleException when the security provider has a general failure.
  +     * @exception InsufficientPrivilegeException when the requestor is denied due to insufficient privilege 
  +     */
  +    public void saveRole(Role role)
  +        throws JetspeedSecurityException
  +    {
  +        if(!roleExists(role.getName()))
  +        {
  +            throw new RoleException("The role '" + 
  +                role.getName() + "' doesn't exists");
  +        }
  +
  +        try
  +        {
  +            if (role instanceof TurbineRole)
  +            {
  +                TurbineRolePeer.doUpdate((TurbineRole)role);
  +            }
  +            else
  +            {
  +                throw new RoleException("TurbineRoleManagment: Role is not a Turbine role, cannot update");
  +            }
  +
  +        }
  +        catch(Exception e)
  +        {
  +            throw new RoleException("Failed to create role '" +
  +                role.getName() + "'", e);
  +        }
   
       }
   
  
  
  
  1.1.2.6   +3 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineUserManagement.java
  
  Index: TurbineUserManagement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineUserManagement.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- TurbineUserManagement.java	11 Jun 2002 18:09:30 -0000	1.1.2.5
  +++ TurbineUserManagement.java	17 Jun 2002 21:27:04 -0000	1.1.2.6
  @@ -332,9 +332,8 @@
           {
               try
               {
  -                JetspeedSecurity.grant(user, 
  -                      JetspeedSecurity.getGroup(JetspeedSecurity.JETSPEED_GROUP), 
  -                      JetspeedSecurity.getRole(roles[ix]));
  +                JetspeedSecurity.grantRole(user.getUserName(), 
  +                      JetspeedSecurity.getRole(roles[ix]).getName());
               }
               catch(Exception e)
               {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +563 -0    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineGroupManagement.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +1 -2      jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties
  
  Index: JetspeedSecurity.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- JetspeedSecurity.properties	14 Jun 2002 06:43:58 -0000	1.1.2.12
  +++ JetspeedSecurity.properties	17 Jun 2002 21:27:05 -0000	1.1.2.13
  @@ -19,8 +19,7 @@
   # Authorization Service                 #
   #########################################
   
  -# services.PortalAccessController.classname=org.apache.jetspeed.services.security.registry.RegistryAccessController
  -services.PortalAccessController.classname=org.apache.jetspeed.services.security.nosecurity.NoSecurityAccessController
  +services.PortalAccessController.classname=org.apache.jetspeed.services.security.registry.RegistryAccessController
   
   #########################################
   # User Management Service               #
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message