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/services/psmlmanager CastorPsmlManagerService.java PsmlImporter.java
Date Mon, 25 Feb 2002 04:51:24 GMT
taylor      02/02/24 20:51:24

  Modified:    src/java/org/apache/jetspeed/om/profile
                        BaseProfileLocator.java
               src/java/org/apache/jetspeed/services/psmlmanager
                        CastorPsmlManagerService.java PsmlImporter.java
  Log:
  - replaced all refs to TurbineUser with BaseJetspeedUser
  
  Revision  Changes    Path
  1.7       +3 -3      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseProfileLocator.java	12 Feb 2002 03:49:38 -0000	1.6
  +++ BaseProfileLocator.java	25 Feb 2002 04:51:24 -0000	1.7
  @@ -56,7 +56,7 @@
   
   import org.apache.turbine.util.Log;
   import org.apache.turbine.om.security.User;
  -import org.apache.turbine.om.security.TurbineUser;
  +import org.apache.jetspeed.om.security.BaseJetspeedUser;
   import org.apache.turbine.om.security.Role;
   import org.apache.turbine.om.security.Group;
   import org.apache.turbine.util.security.UnknownEntityException;
  @@ -73,7 +73,7 @@
    *
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
    * @author <a href="mailto:adambalk@cisco.com">Atul Dambalkar</a>
  - * @version $Id: BaseProfileLocator.java,v 1.6 2002/02/12 03:49:38 paulsp Exp $
  + * @version $Id: BaseProfileLocator.java,v 1.7 2002/02/25 04:51:24 taylor Exp $
   */
   
   public class BaseProfileLocator implements ProfileLocator, Cloneable
  @@ -145,7 +145,7 @@
                   // warning: this ties us to turbine security
                   // we could load class from TRP 
                   // (services.SecurityService.user.class)
  -                User user = new TurbineUser();
  +                User user = new BaseJetspeedUser();
                   user.setUserName("anon");
                   this.setUser(user);
               }
  
  
  
  1.16      +3 -3      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CastorPsmlManagerService.java	17 Dec 2001 15:32:28 -0000	1.15
  +++ CastorPsmlManagerService.java	25 Feb 2002 04:51:24 -0000	1.16
  @@ -76,7 +76,7 @@
   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.om.security.TurbineUser;
  +import org.apache.jetspeed.om.security.BaseJetspeedUser;
   import org.apache.turbine.om.security.TurbineRole;
   import org.apache.turbine.om.security.TurbineGroup;
   
  @@ -112,7 +112,7 @@
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
    * @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
  - * @version $Id: CastorPsmlManagerService.java,v 1.15 2001/12/17 15:32:28 sgala Exp $
  + * @version $Id: CastorPsmlManagerService.java,v 1.16 2002/02/25 04:51:24 taylor Exp $
    */
   public class CastorPsmlManagerService extends TurbineBaseService
       implements PsmlManagerService
  @@ -1208,7 +1208,7 @@
                               // warning: this ties us to turbine security
                               // we could load class from TRP 
                               // (services.SecurityService.user.class)
  -                            user = new TurbineUser();
  +                            user = new BaseJetspeedUser();
                               user.setUserName(file.getName());
                               qs.profile.setUser(user);
                               qs.clearName = true;
  
  
  
  1.7       +1 -4      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PsmlImporter.java	4 Dec 2001 18:28:26 -0000	1.6
  +++ PsmlImporter.java	25 Feb 2002 04:51:24 -0000	1.7
  @@ -59,9 +59,6 @@
   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.om.security.TurbineUser;
  -import org.apache.turbine.om.security.TurbineRole;
  -import org.apache.turbine.om.security.TurbineGroup;
   import org.apache.turbine.services.TurbineServices;
   
   
  @@ -87,7 +84,7 @@
    * Reads all PSML files from the file system and imports them into PSML DB
    *
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  - * @version $Id: PsmlImporter.java,v 1.6 2001/12/04 18:28:26 sgala Exp $
  + * @version $Id: PsmlImporter.java,v 1.7 2002/02/25 04:51:24 taylor Exp $
    */
   public class PsmlImporter
   {   
  
  
  

--
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