cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonWrapper.java Target.java
Date Mon, 17 Nov 2003 03:01:13 GMT
vgritsenko    2003/11/16 19:01:13

  Modified:    src/java/org/apache/cocoon/bean CocoonWrapper.java
                        Target.java
  Log:
  add comment; align...
  
  Revision  Changes    Path
  1.10      +8 -9      cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java
  
  Index: CocoonWrapper.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CocoonWrapper.java	7 Nov 2003 11:31:17 -0000	1.9
  +++ CocoonWrapper.java	17 Nov 2003 03:01:12 -0000	1.10
  @@ -515,14 +515,13 @@
        * @return a <code>String</code> value for the content
        * @exception Exception if an error occurs
        */
  -    protected int getPage(
  -        String deparameterizedURI,
  -        long lastModified,
  -        Map parameters,
  -        Map links,
  -        List gatheredLinks,
  -        OutputStream stream)
  -        throws Exception {
  +    protected int getPage(String deparameterizedURI,
  +                          long lastModified,
  +                          Map parameters,
  +                          Map links,
  +                          List gatheredLinks,
  +                          OutputStream stream)
  +    throws Exception {
   
           parameters.put("user-agent", userAgent);
           parameters.put("accept", accept);
  
  
  
  1.11      +4 -1      cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/Target.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Target.java	15 Nov 2003 04:21:30 -0000	1.10
  +++ Target.java	17 Nov 2003 03:01:12 -0000	1.11
  @@ -110,6 +110,8 @@
           this.destURI = destURI;
           
           this.parameters = new TreeMap();
  +        
  +        // Normalize sourceURI, and make sure that parameters is always in the same order
           sourceURI = NetUtils.normalize(root + sourceURI);
           this.deparameterizedSourceURI = NetUtils.deparameterize(sourceURI, this.parameters);
           this.sourceURI = NetUtils.parameterize(this.deparameterizedSourceURI, this.parameters);
  @@ -370,6 +372,7 @@
       public String getSourceURI() {
           return this.sourceURI;
       }
  +    
       /**
        * Gets the source URI for this target, with 
        * parameters removed. This is the URI that is 
  
  
  

Mime
View raw message