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/src/java/org/apache/jetspeed/om/profile BaseProfileLocator.java
Date Tue, 25 Nov 2003 16:26:36 GMT
taylor      2003/11/25 08:26:36

  Modified:    src/java/org/apache/jetspeed/om/profile
                        BaseProfileLocator.java
  Log:
  Fixed bug in recent patch where tokens were being eaten twice on role
  
  Revision  Changes    Path
  1.20      +11 -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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- BaseProfileLocator.java	3 Nov 2003 17:43:26 -0000	1.19
  +++ BaseProfileLocator.java	25 Nov 2003 16:26:36 -0000	1.20
  @@ -24,11 +24,11 @@
    *    if and wherever such third-party acknowledgments normally appear.
    *
    * 4. The names "Apache" and "Apache Software Foundation" and
  - *     "Apache Jetspeed" must not be used to endorse or promote products
  + *    "Apache Jetspeed" must not be used to endorse or promote products
    *    derived from this software without prior written permission. For
    *    written permission, please contact apache@apache.org.
    *
  - * 5. Products derived from this software may not be called "Apache" or
  + * 5. Products derived from this software may not be called "Apache",
    *    "Apache Jetspeed", nor may "Apache" appear in their name, without
    *    prior written permission of the Apache Software Foundation.
    *
  @@ -247,8 +247,8 @@
                   try
                   {
                       // keep profile locator from failing if the user has been removed
  -				    // from security as it may still exist in the PSML structure.
  -                	this.userName = tok.nextToken();
  +                    // from security as it may still exist in the PSML structure.
  +                    this.userName = tok.nextToken();
                       this.setUser( JetspeedSecurity.getUser(this.userName) );
                   }
                   catch (Exception e)
  @@ -261,8 +261,8 @@
                   try
                   {
                       // keep profile locator from failing if the group has been removed
  -				    // from security as it may still exist in the PSML structure.
  -                	this.groupName = tok.nextToken();
  +                    // from security as it may still exist in the PSML structure.
  +                    this.groupName = tok.nextToken();
                       this.setGroup( JetspeedSecurity.getGroup(this.groupName) );
                   }
                   catch (Exception e)
  @@ -274,10 +274,10 @@
               {
                   try
                   {
  -                	// keep profile locator from failing if the role has been removed
  -                	// from security as it may still exist in the PSML structure.
  -					this.roleName = tok.nextToken();
  -                    this.setRole( JetspeedSecurity.getRole(tok.nextToken()) );
  +                    // keep profile locator from failing if the role has been removed
  +                    // from security as it may still exist in the PSML structure.
  +                    this.roleName = tok.nextToken();
  +                    this.setRole(JetspeedSecurity.getRole(this.roleName));
                   }
                   catch (Exception e)
                   {
  
  
  

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


Mime
View raw message