You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/10/20 12:08:06 UTC

cvs commit: jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine GroupAdapter.java UserAdapter.java SecurityServiceAdapter.java RoleAdapter.java BaseAdapter.java

epugh       2003/10/20 03:08:06

  Modified:    security/src/java/org/apache/fulcrum/security/adapter/turbine
                        GroupAdapter.java UserAdapter.java
                        SecurityServiceAdapter.java RoleAdapter.java
                        BaseAdapter.java
  Log:
  Update javadocs
  
  Revision  Changes    Path
  1.6       +5 -5      jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java
  
  Index: GroupAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GroupAdapter.java	26 Aug 2003 21:16:26 -0000	1.5
  +++ GroupAdapter.java	20 Oct 2003 10:08:06 -0000	1.6
  @@ -71,28 +71,28 @@
   	public GroupAdapter(org.apache.fulcrum.security.entity.Group group){
   		super((SecurityEntity)group);
   	   }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Group#grant(org.apache.turbine.om.security.User, org.apache.turbine.om.security.Role)
        */
       public void grant(User arg0, Role arg1) throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Group#grant(org.apache.turbine.om.security.User, org.apache.turbine.util.security.RoleSet)
        */
       public void grant(User arg0, RoleSet arg1) throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Group#revoke(org.apache.turbine.om.security.User, org.apache.turbine.om.security.Role)
        */
       public void revoke(User arg0, Role arg1) throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Group#revoke(org.apache.turbine.om.security.User, org.apache.turbine.util.security.RoleSet)
        */
       public void revoke(User arg0, RoleSet arg1) throws TurbineSecurityException
  
  
  
  1.7       +68 -77    jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java
  
  Index: UserAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UserAdapter.java	27 Aug 2003 08:32:37 -0000	1.6
  +++ UserAdapter.java	20 Oct 2003 10:08:06 -0000	1.7
  @@ -74,99 +74,94 @@
   	   {
   		   super((SecurityEntity)user);
   	   }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getAccessCounter()
        */
       public int getAccessCounter()
       {
  -        // TODO Auto-generated method stub
           return 0;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getAccessCounterForSession()
        */
       public int getAccessCounterForSession()
       {
  -        // TODO Auto-generated method stub
           return 0;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getLastAccessDate()
        */
       public Date getLastAccessDate()
       {
  -        // TODO Auto-generated method stub
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getCreateDate()
        */
       public Date getCreateDate()
       {
  -        // TODO Auto-generated method stub
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getLastLogin()
        */
       public Date getLastLogin()
       {
  -        // TODO Auto-generated method stub
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getPassword()
        */
       public String getPassword()
       {
           return ((org.apache.fulcrum.security.entity.User)entity).getPassword();
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getPerm(java.lang.String)
        */
       public Object getPerm(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getPerm(java.lang.String, java.lang.Object)
        */
       public Object getPerm(String arg0, Object arg1)
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getPermStorage()
        */
       public Hashtable getPermStorage()
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getTempStorage()
        */
       public Hashtable getTempStorage()
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getTemp(java.lang.String)
        */
       public Object getTemp(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getTemp(java.lang.String, java.lang.Object)
        */
       public Object getTemp(String arg0, Object arg1)
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
       /* Adapter from getUserName to getName!
  @@ -176,129 +171,129 @@
       {
           return getName();
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getFirstName()
        */
       public String getFirstName()
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getLastName()
        */
       public String getLastName()
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getEmail()
        */
       public String getEmail()
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setHasLoggedIn(java.lang.Boolean)
        */
       public void setHasLoggedIn(Boolean arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#hasLoggedIn()
        */
       public boolean hasLoggedIn()
       {
  -        // TODO Auto-generated method stub
  +
           return false;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#incrementAccessCounter()
        */
       public void incrementAccessCounter()
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#incrementAccessCounterForSession()
        */
       public void incrementAccessCounterForSession()
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#removeTemp(java.lang.String)
        */
       public Object removeTemp(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setAccessCounter(int)
        */
       public void setAccessCounter(int arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setAccessCounterForSession(int)
        */
       public void setAccessCounterForSession(int arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setLastAccessDate()
        */
       public void setLastAccessDate()
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setLastLogin(java.util.Date)
        */
       public void setLastLogin(Date arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setPassword(java.lang.String)
        */
       public void setPassword(String arg0)
       {
   		((org.apache.fulcrum.security.entity.User)entity).setPassword(arg0);
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setPerm(java.lang.String, java.lang.Object)
        */
       public void setPerm(String arg0, Object arg1)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setPermStorage(java.util.Hashtable)
        */
       public void setPermStorage(Hashtable arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setTempStorage(java.util.Hashtable)
        */
       public void setTempStorage(Hashtable arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setTemp(java.lang.String, java.lang.Object)
        */
       public void setTemp(String arg0, Object arg1)
       {
  -        // TODO Auto-generated method stub
  +
       }
       /* Adaper for user name to name.
        * @see org.apache.turbine.om.security.User#setUserName(java.lang.String)
  @@ -307,77 +302,73 @@
       {
   		setName(arg0);
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setFirstName(java.lang.String)
        */
       public void setFirstName(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setLastName(java.lang.String)
        */
       public void setLastName(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setCreateDate(java.util.Date)
        */
       public void setCreateDate(Date arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setEmail(java.lang.String)
        */
       public void setEmail(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#isConfirmed()
        */
       public boolean isConfirmed()
       {
  -        // TODO Auto-generated method stub
  +
           return false;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#setConfirmed(java.lang.String)
        */
       public void setConfirmed(String arg0)
       {
  -        // TODO Auto-generated method stub
  +
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#getConfirmed()
        */
       public String getConfirmed()
       {
  -        // TODO Auto-generated method stub
           return null;
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see org.apache.turbine.om.security.User#updateLastLogin()
        */
       public void updateLastLogin() throws Exception
       {
  -        // TODO Auto-generated method stub
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent)
        */
       public void valueBound(HttpSessionBindingEvent arg0)
       {
  -        // TODO Auto-generated method stub
       }
  -    /* (non-Javadoc)
  +    /* Does Nothing.
        * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(javax.servlet.http.HttpSessionBindingEvent)
        */
       public void valueUnbound(HttpSessionBindingEvent arg0)
       {
  -        // TODO Auto-generated method stub
       }
   
   
  
  
  
  1.4       +41 -36    jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java
  
  Index: SecurityServiceAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SecurityServiceAdapter.java	26 Aug 2003 21:16:26 -0000	1.3
  +++ SecurityServiceAdapter.java	20 Oct 2003 10:08:06 -0000	1.4
  @@ -83,6 +83,10 @@
    * security.  However, it should actually use the "Turbine" model of 
    * security.  I didn't do that because I don't quite understand some of
    * the reasons behind the "Turbine" model.
  + * 
  + * All the methods that currently throw a not implemented RuntimeException
  + * could easily delegate their calls to the Fulcrum SecurityService.
  + * 
    *
    * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
    * @version $Id$
  @@ -657,14 +661,15 @@
           PermissionSet permissionSet = getPermissions(new Criteria());
           return permissionSet.contains(permission);
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getUserManager()
        */
       public UserManager getUserManager()
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* This doesn't do anything.  You don't need to call this anymore
  +     * as the SecurityService loads it's UserManager via Avalon.
        * @see org.apache.turbine.services.security.SecurityService#setUserManager(org.apache.turbine.services.security.UserManager)
        */
       public void setUserManager(UserManager arg0)
  @@ -672,28 +677,28 @@
           //throw new RuntimeException("Not implemented");
           log.info("setUserManager() call being eaten by SecurityServiceAdapter");
       }
  -    /* (non-Javadoc)
  +    /* Returns whther an account exists for this username
        * @see org.apache.turbine.services.security.SecurityService#accountExists(java.lang.String)
        */
  -    public boolean accountExists(String arg0) throws org.apache.turbine.util.security.DataBackendException
  +    public boolean accountExists(String name) throws org.apache.turbine.util.security.DataBackendException
       {
           try
           {
  -            return securityService.getUserManager().checkExists(arg0);
  +            return securityService.getUserManager().checkExists(name);
           }
           catch (DataBackendException dbe)
           {
               throw new org.apache.turbine.util.security.DataBackendException(dbe.getMessage(), dbe);
           }
       }
  -    /* (non-Javadoc)
  +    /* 
        * @see org.apache.turbine.services.security.SecurityService#accountExists(org.apache.turbine.om.security.User)
        */
       public boolean accountExists(User arg0) throws org.apache.turbine.util.security.DataBackendException
       {
           return accountExists(arg0.getName());
       }
  -    /* (non-Javadoc)
  +    /* 
        * @see org.apache.turbine.services.security.SecurityService#getAuthenticatedUser(java.lang.String, java.lang.String)
        */
       public User getAuthenticatedUser(String arg0, String arg1)
  @@ -719,7 +724,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(dbe.getMessage(), dbe);
           }
       }
  -    /* (non-Javadoc)
  +    /* 
        * @see org.apache.turbine.services.security.SecurityService#getUser(java.lang.String)
        */
       public User getUser(String arg0)
  @@ -738,7 +743,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(dbe.getMessage(), dbe);
           }
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getUsers(org.apache.torque.util.Criteria)
        */
       public User[] getUsers(Criteria arg0) throws org.apache.turbine.util.security.DataBackendException
  @@ -752,7 +757,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(uee.getMessage(), uee);
           }
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getUserList(org.apache.torque.util.Criteria)
        */
       public List getUserList(Criteria arg0) throws org.apache.turbine.util.security.DataBackendException
  @@ -766,7 +771,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(uee.getMessage(), uee);
           }
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#saveUser(org.apache.turbine.om.security.User)
        */
       public void saveUser(User arg0)
  @@ -774,7 +779,7 @@
       {
           throw new org.apache.turbine.util.security.UnknownEntityException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#saveOnSessionUnbind(org.apache.turbine.om.security.User)
        */
       public void saveOnSessionUnbind(User arg0)
  @@ -782,14 +787,14 @@
       {
           throw new org.apache.turbine.util.security.DataBackendException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#addUser(org.apache.turbine.om.security.User, java.lang.String)
        */
       public void addUser(User arg0, String arg1) throws org.apache.turbine.util.security.DataBackendException
       {
           throw new org.apache.turbine.util.security.DataBackendException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#removeUser(org.apache.turbine.om.security.User)
        */
       public void removeUser(User arg0)
  @@ -797,28 +802,28 @@
       {
           throw new org.apache.turbine.util.security.DataBackendException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#encryptPassword(java.lang.String)
        */
       public String encryptPassword(String arg0)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#encryptPassword(java.lang.String, java.lang.String)
        */
       public String encryptPassword(String arg0, String arg1)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#checkPassword(java.lang.String, java.lang.String)
        */
       public boolean checkPassword(String arg0, String arg1)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#changePassword(org.apache.turbine.om.security.User, java.lang.String, java.lang.String)
        */
       public void changePassword(User arg0, String arg1, String arg2)
  @@ -829,7 +834,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#forcePassword(org.apache.turbine.om.security.User, java.lang.String)
        */
       public void forcePassword(User arg0, String arg1)
  @@ -837,35 +842,35 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getGlobalGroup()
        */
       public Group getGlobalGroup()
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getNewGroup(java.lang.String)
        */
       public Group getNewGroup(String arg0)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getNewRole(java.lang.String)
        */
       public Role getNewRole(String arg0)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getNewPermission(java.lang.String)
        */
       public Permission getNewPermission(String arg0)
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getGroup(java.lang.String)
        */
       public Group getGroup(String arg0)
  @@ -873,7 +878,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getGroupByName(java.lang.String)
        */
       public Group getGroupByName(String arg0)
  @@ -881,7 +886,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getGroupById(int)
        */
       public Group getGroupById(int arg0)
  @@ -889,7 +894,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getRole(java.lang.String)
        */
       public Role getRole(String arg0)
  @@ -897,7 +902,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getRoleByName(java.lang.String)
        */
       public Role getRoleByName(String arg0)
  @@ -905,7 +910,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getRoleById(int)
        */
       public Role getRoleById(int arg0)
  @@ -913,7 +918,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getPermission(java.lang.String)
        */
       public Permission getPermission(String arg0)
  @@ -921,7 +926,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getPermissionByName(java.lang.String)
        */
       public Permission getPermissionByName(String arg0)
  @@ -929,7 +934,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getPermissionById(int)
        */
       public Permission getPermissionById(int arg0)
  @@ -937,7 +942,7 @@
       {
           throw new RuntimeException("Not implemented");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.services.security.SecurityService#getAllGroups()
        */
       public GroupSet getAllGroups() throws org.apache.turbine.util.security.DataBackendException
  @@ -960,7 +965,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(uee.getMessage(), uee);
           }
       }
  -    /* (non-Javadoc)
  +    /* Return all the roles from the Fulcrum Security Service.
        * @see org.apache.turbine.services.security.SecurityService#getAllRoles()
        */
       public RoleSet getAllRoles() throws org.apache.turbine.util.security.DataBackendException
  @@ -983,7 +988,7 @@
               throw new org.apache.turbine.util.security.DataBackendException(uee.getMessage(), uee);
           }
       }
  -    /* (non-Javadoc)
  +    /* Return all the permissions from the Fulcrum SecurityService.
        * @see org.apache.turbine.services.security.SecurityService#getAllPermissions()
        */
       public PermissionSet getAllPermissions() throws org.apache.turbine.util.security.DataBackendException
  
  
  
  1.6       +6 -6      jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java
  
  Index: RoleAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RoleAdapter.java	26 Aug 2003 21:16:26 -0000	1.5
  +++ RoleAdapter.java	20 Oct 2003 10:08:06 -0000	1.6
  @@ -79,35 +79,35 @@
       {
   		throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Role#create(java.lang.String)
        */
       public Role create(String arg0) throws TurbineSecurityException
       {
   		throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Role#grant(org.apache.turbine.om.security.Permission)
        */
       public void grant(Permission arg0) throws TurbineSecurityException
       {
   		throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Role#grant(org.apache.turbine.util.security.PermissionSet)
        */
       public void grant(PermissionSet arg0) throws TurbineSecurityException
       {
   		throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Role#revoke(org.apache.turbine.om.security.Permission)
        */
       public void revoke(Permission arg0) throws TurbineSecurityException
       {
   		throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.Role#revoke(org.apache.turbine.util.security.PermissionSet)
        */
       public void revoke(PermissionSet arg0) throws TurbineSecurityException
  
  
  
  1.4       +12 -12    jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java
  
  Index: BaseAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BaseAdapter.java	26 Aug 2003 21:16:26 -0000	1.3
  +++ BaseAdapter.java	20 Oct 2003 10:08:06 -0000	1.4
  @@ -86,7 +86,7 @@
       {
           return getIdAsObj().intValue();
       }
  -    /* (non-Javadoc)
  +    /* 
        * @see org.apache.turbine.om.security.SecurityEntity#getIdAsObj()
        */
       public Integer getIdAsObj()
  @@ -101,30 +101,30 @@
   	 {
   		throw new RuntimeException("Unsupported operation");
   	 }
  -    /* (non-Javadoc)
  +    /* Not implemented.
        * @see org.apache.turbine.om.security.SecurityEntity#setId(int)
        */
       public void setId(int arg0)
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  -    	* @see org.apache.turbine.om.security.Group#save()
  -    	*/
  +    /* Not implemented.
  +	 * @see org.apache.turbine.om.security.Group#save()
  +	 */
       public void save() throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  -    	* @see org.apache.turbine.om.security.Group#remove()
  -    	*/
  +    /* Not implemented.
  +     * @see org.apache.turbine.om.security.Group#remove()
  +     */
       public void remove() throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
       }
  -    /* (non-Javadoc)
  -    	* @see org.apache.turbine.om.security.Group#rename(java.lang.String)
  -    	*/
  +    /* Not implemented.
  +	 * @see org.apache.turbine.om.security.Group#rename(java.lang.String)
  +	 */
       public void rename(String arg0) throws TurbineSecurityException
       {
           throw new RuntimeException("Unsupported operation");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org