cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/environment/wrapper EnvironmentWrapper.java
Date Tue, 14 Aug 2001 15:54:54 GMT
vgritsenko    01/08/14 08:54:54

  Modified:    src/org/apache/cocoon/environment Tag: cocoon_20_branch
                        AbstractEnvironment.java Environment.java
               src/org/apache/cocoon/environment/commandline Tag:
                        cocoon_20_branch
                        AbstractCommandLineEnvironment.java
               src/org/apache/cocoon/environment/http Tag: cocoon_20_branch
                        HttpEnvironment.java
               src/org/apache/cocoon/environment/wrapper Tag:
                        cocoon_20_branch EnvironmentWrapper.java
  Log:
  - add getSourceHandler() method to Environment,
  - add getContentType() method to Environment
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.7   +9 -1      xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.6.2.6
  retrieving revision 1.6.2.7
  diff -u -r1.6.2.6 -r1.6.2.7
  --- AbstractEnvironment.java	2001/08/14 13:12:45	1.6.2.6
  +++ AbstractEnvironment.java	2001/08/14 15:54:53	1.6.2.7
  @@ -25,7 +25,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.6.2.6 $ $Date: 2001/08/14 13:12:45 $
  + * @version CVS $Revision: 1.6.2.7 $ $Date: 2001/08/14 15:54:53 $
    */
   public abstract class AbstractEnvironment extends AbstractLoggable implements Environment
{
   
  @@ -96,6 +96,14 @@
           this.action = action;
           this.objectModel = new HashMap();
           this.rootContext = context;
  +    }
  +
  +    /**
  +     * Get the <code>SourceHandler</code> for the current request
  +     */
  +    public SourceHandler getSourceHandler()
  +    {
  +        return this.sourceHandler;
       }
   
       /**
  
  
  
  1.2.2.4   +11 -1     xml-cocoon2/src/org/apache/cocoon/environment/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Environment.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- Environment.java	2001/07/10 08:17:04	1.2.2.3
  +++ Environment.java	2001/08/14 15:54:53	1.2.2.4
  @@ -20,12 +20,17 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.2.2.3 $ $Date: 2001/07/10 08:17:04 $
  + * @version CVS $Revision: 1.2.2.4 $ $Date: 2001/08/14 15:54:53 $
    */
   
   public interface Environment extends SourceResolver {
   
       /**
  +     * Get the <code>SourceHandler</code> for the current request
  +     */
  +    SourceHandler getSourceHandler();
  +
  +    /**
        * Set the <code>SourceHandler</code> for the current request
        */
       void setSourceHandler(SourceHandler sourceHandler);
  @@ -64,6 +69,11 @@
        * Set the content type of the generated resource
        */
       void setContentType(String mimeType);
  +
  +    /**
  +     * Get the content type of the resource
  +     */
  +    String getContentType();
   
       /**
        * Set the length of the generated content
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.3 +2 -2      xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
  
  Index: AbstractCommandLineEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
  retrieving revision 1.1.1.1.2.2
  retrieving revision 1.1.1.1.2.3
  diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
  --- AbstractCommandLineEnvironment.java	2001/07/04 07:26:59	1.1.1.1.2.2
  +++ AbstractCommandLineEnvironment.java	2001/08/14 15:54:53	1.1.1.1.2.3
  @@ -20,7 +20,7 @@
    * This environment is used to save the requested file to disk.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/04 07:26:59 $
  + * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/08/14 15:54:53 $
    */
   
   public abstract class AbstractCommandLineEnvironment
  @@ -64,7 +64,7 @@
       }
   
       /**
  -     * Set the ContentType
  +     * Get the ContentType
        */
       public String getContentType() {
           return this.contentType;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +11 -0     xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java
  
  Index: HttpEnvironment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/HttpEnvironment.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- HttpEnvironment.java	2001/06/12 21:30:15	1.4.2.1
  +++ HttpEnvironment.java	2001/08/14 15:54:54	1.4.2.2
  @@ -42,6 +42,9 @@
       /** The OutputStream */
       private OutputStream outputStream = null;
   
  +    /** Cache content type as there is no getContentType() in reponse object */
  +    private String contentType = null;
  +
       /**
        * Constructs a HttpEnvironment object from a HttpServletRequest
        * and HttpServletResponse objects
  @@ -114,6 +117,14 @@
        */
       public void setContentType(String contentType) {
           this.response.setContentType(contentType);
  +        this.contentType = contentType;
  +    }
  +
  +    /**
  +     * Get the ContentType
  +     */
  +    public String getContentType() {
  +        return this.contentType;
       }
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +16 -1     xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
  
  Index: EnvironmentWrapper.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- EnvironmentWrapper.java	2001/07/12 06:33:29	1.1.2.2
  +++ EnvironmentWrapper.java	2001/08/14 15:54:54	1.1.2.3
  @@ -34,7 +34,7 @@
    * contains a <code>RequestWrapper</code> object.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version $Id: EnvironmentWrapper.java,v 1.1.2.2 2001/07/12 06:33:29 cziegeler Exp $
  + * @version $Id: EnvironmentWrapper.java,v 1.1.2.3 2001/08/14 15:54:54 vgritsenko Exp $
    */
   public final class EnvironmentWrapper
   implements Environment {
  @@ -124,6 +124,21 @@
        */
       public void setContentType(String contentType) {
           // ignore this
  +    }
  +
  +    /**
  +     * Get the ContentType
  +     */
  +    public String getContentType() {
  +        // ignore this
  +        return null;
  +    }
  +
  +    /**
  +     * Get the <code>SourceHandler</code> for the current request
  +     */
  +    public SourceHandler getSourceHandler() {
  +        return this.environment.getSourceHandler();
       }
   
       /**
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message