cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl StaticProfileManager.java AuthenticationProfileManager.java
Date Tue, 27 Jan 2004 14:58:05 GMT
cziegeler    2004/01/27 06:58:05

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/layout
                        AbstractLayout.java AbstractParameters.java
               src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
                        StaticProfileManager.java
                        AuthenticationProfileManager.java
  Log:
  Move to new collections (sigh)
  
  Revision  Changes    Path
  1.13      +3 -3      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java
  
  Index: AbstractLayout.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractLayout.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractLayout.java	27 Jan 2004 11:14:13 -0000	1.12
  +++ AbstractLayout.java	27 Jan 2004 14:58:05 -0000	1.13
  @@ -53,7 +53,7 @@
   import java.util.Map;
   
   import org.apache.cocoon.portal.factory.impl.AbstractProducible;
  -import org.apache.commons.collections.SequencedHashMap;
  +import org.apache.commons.collections.map.LinkedMap;
   
   /**
    *
  @@ -70,7 +70,7 @@
       
       protected Item parent;
       
  -    protected Map parameters = new SequencedHashMap();
  +    protected Map parameters = new LinkedMap();
        
       /* (non-Javadoc)
        * @see org.apache.cocoon.portal.layout.Parameters#getParameters()
  
  
  
  1.4       +3 -3      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractParameters.java
  
  Index: AbstractParameters.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/AbstractParameters.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractParameters.java	22 May 2003 06:55:15 -0000	1.3
  +++ AbstractParameters.java	27 Jan 2004 14:58:05 -0000	1.4
  @@ -52,7 +52,7 @@
   
   import java.util.Map;
   
  -import org.apache.commons.collections.SequencedHashMap;
  +import org.apache.commons.collections.map.LinkedMap;
   
   /**
    *
  @@ -64,7 +64,7 @@
   public abstract class AbstractParameters 
       implements Parameters {
   
  -    protected Map parameters = new SequencedHashMap();
  +    protected Map parameters = new LinkedMap();
        
       /* (non-Javadoc)
        * @see org.apache.cocoon.portal.layout.Parameters#getParameters()
  
  
  
  1.9       +5 -5      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
  
  Index: StaticProfileManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StaticProfileManager.java	20 Oct 2003 13:37:10 -0000	1.8
  +++ StaticProfileManager.java	27 Jan 2004 14:58:05 -0000	1.9
  @@ -69,8 +69,8 @@
   import org.apache.cocoon.portal.layout.Layout;
   import org.apache.cocoon.portal.layout.LayoutFactory;
   import org.apache.cocoon.portal.profile.ProfileLS;
  -import org.apache.commons.collections.SequencedHashMap;
  -import org.apache.commons.collections.StaticBucketMap;
  +import org.apache.commons.collections.map.LinkedMap;
  +import org.apache.commons.collections.map.StaticBucketMap;
   import org.apache.excalibur.source.SourceValidity;
   
   /**
  @@ -133,7 +133,7 @@
               parameters.put("profiletype", "layout");
               parameters.put("objectmap", copletInstanceDataManager.getCopletInstanceData());
   
  -            Map map = new SequencedHashMap();
  +            Map map = new LinkedMap();
               map.put("base", this.profilesPath);
               map.put("portalname", service.getPortalName());
               map.put("profile", "layout");
  @@ -224,7 +224,7 @@
               parameters.put("profiletype", "copletbasedata");
               parameters.put("objectmap", null);
   
  -            Map map = new SequencedHashMap();
  +            Map map = new LinkedMap();
               map.put("base", this.profilesPath);
               map.put("portalname", service.getPortalName());
               map.put("profile", "coplet");
  
  
  
  1.16      +3 -3      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
  
  Index: AuthenticationProfileManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AuthenticationProfileManager.java	8 Jan 2004 13:57:59 -0000	1.15
  +++ AuthenticationProfileManager.java	27 Jan 2004 14:58:05 -0000	1.16
  @@ -73,7 +73,7 @@
   import org.apache.cocoon.webapps.authentication.AuthenticationManager;
   import org.apache.cocoon.webapps.authentication.user.RequestState;
   import org.apache.cocoon.webapps.authentication.user.UserHandler;
  -import org.apache.commons.collections.SequencedHashMap;
  +import org.apache.commons.collections.map.LinkedMap;
   import org.apache.commons.lang.exception.ExceptionUtils;
   import org.apache.excalibur.source.SourceNotFoundException;
   import org.apache.excalibur.source.SourceValidity;
  @@ -448,7 +448,7 @@
               uri = config.getChild(profileType + "-user-" + postFix).getAttribute("uri");
           }
   
  -        Map key = new SequencedHashMap();
  +        Map key = new LinkedMap();
           key.put("baseuri", uri);
           key.put("separator", "?");
           key.put("portal", service.getPortalName());
  
  
  

Mime
View raw message