commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http HeaderTag.java PutTag.java PostTag.java HttpTagSupport.java OptionsTag.java GetTag.java HeadTag.java DeleteTag.java ParameterTag.java Proxy.java BodyTag.java SessionTag.java HttpTagLibrary.java
Date Thu, 09 Sep 2004 12:08:26 GMT
dion        2004/09/09 05:08:26

  Modified:    jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http
                        HeaderTag.java PutTag.java PostTag.java
                        HttpTagSupport.java OptionsTag.java GetTag.java
                        HeadTag.java DeleteTag.java ParameterTag.java
                        Proxy.java BodyTag.java SessionTag.java
                        HttpTagLibrary.java
  Log:
  Fix license file whitespace
  
  Revision  Changes    Path
  1.8       +9 -9      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeaderTag.java
  
  Index: HeaderTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeaderTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HeaderTag.java	25 Feb 2004 01:31:50 -0000	1.7
  +++ HeaderTag.java	9 Sep 2004 12:08:26 -0000	1.8
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -22,7 +22,7 @@
   
   /**
    * A tag to hold request headers
  - * 
  + *
    * @author  dion
    * @version $Id$
    */
  @@ -31,7 +31,7 @@
       private String _name;
       /** parameter value */
       private String _value;
  -    
  +
       /** Creates a new instance of HeaderTag */
       public HeaderTag() {
       }
  @@ -60,7 +60,7 @@
       public String getName() {
           return _name;
       }
  -    
  +
       /**
        * Setter for property name.
        *
  @@ -69,7 +69,7 @@
       public void setName(String name) {
           _name = name;
       }
  -    
  +
       /**
        * Getter for property value.
        *
  @@ -78,7 +78,7 @@
       public String getValue() {
           return _value;
       }
  -    
  +
       /**
        * Setter for property value.
        *
  @@ -87,5 +87,5 @@
       public void setValue(String value) {
           _value = value;
       }
  -    
  +
   }
  
  
  
  1.7       +9 -9      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PutTag.java
  
  Index: PutTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PutTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PutTag.java	25 Feb 2004 01:31:51 -0000	1.6
  +++ PutTag.java	9 Sep 2004 12:08:26 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,15 +28,15 @@
    * @version $Id$
    */
   public class PutTag extends HttpTagSupport {
  -    
  +
       /** the put method */
       private PutMethod _putMethod;
   
       /** Creates a new instance of PutTag */
       public PutTag() {
       }
  -    
  -    /** 
  +
  +    /**
        * Return a {@link HttpMethod method} to be used for put'ing
        *
        * @return a HttpMethod implementation
  @@ -49,14 +49,14 @@
           }
           return _putMethod;
       }
  -    
  -    /** 
  +
  +    /**
        * Set the current parameters on the url method ready for processing
        *
        */
       protected void setParameters() {
       }
  -    
  +
       /**
        * Fail as PUT requests don't have parameters
        *
  
  
  
  1.8       +9 -9      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PostTag.java
  
  Index: PostTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/PostTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PostTag.java	25 Feb 2004 01:31:51 -0000	1.7
  +++ PostTag.java	9 Sep 2004 12:08:26 -0000	1.8
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,15 +28,15 @@
    * @author  dion
    */
   public class PostTag extends HttpTagSupport {
  -    
  +
       /** the post method */
       private PostMethod _postMethod;
   
       /** Creates a new instance of PostTag */
       public PostTag() {
       }
  -    
  -    /** 
  +
  +    /**
        * Return a {@link HttpUrlMethod method} to be used for post'ing
        *
        * @return a HttpUrlMethod implementation
  @@ -49,11 +49,11 @@
           }
           return _postMethod;
       }
  -    
  -    /** 
  +
  +    /**
        * Set the current parameters on the url method ready for processing
        *
  -     * This method <strong>must</strong> be called after 
  +     * This method <strong>must</strong> be called after
        *  {@link getHttpUrlMethod}
        */
       protected void setParameters(HttpMethod method) {
  
  
  
  1.8       +45 -45    jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java
  
  Index: HttpTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagSupport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HttpTagSupport.java	25 Feb 2004 01:31:50 -0000	1.7
  +++ HttpTagSupport.java	9 Sep 2004 12:08:26 -0000	1.8
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -35,26 +35,26 @@
    * @version $Id$
    */
   public abstract class HttpTagSupport extends TagSupport {
  -    
  +
       /** unique identifier of the tag/ variable to store result in */
       private String _var;
   
       /**
        * the path to be tested relative to the host/port specifed on the parent
  -     * {@link SuiteTag suite tag}. 
  +     * {@link SuiteTag suite tag}.
        * Either this property and the suite's host
        * must be provided, or the {@link #getUrl() url} property must be specifed
        */
       private String _path;
  -    
  +
       /**
        * The complete uri to be processed
        * Either this property or the {@link #getPath() path} and the suite's host
        * must be provided.
        */
       private String _uri;
  -    
  -    /** whether or not to follow redirects */ 
  +
  +    /** whether or not to follow redirects */
       private boolean _followRedirects = false;
       /** list of parameters as name value pairs */
       private List _parameters;
  @@ -62,7 +62,7 @@
       private List _requestHeaders;
       /** the header name for the user agent */
       private static final String HEADER_NAME_USER_AGENT = "User-Agent";
  -    
  +
       /**
        * Creates a new instance of HttpTag
        */
  @@ -70,7 +70,7 @@
           setParameters(new ArrayList());
           setRequestHeaders(new ArrayList());
       }
  -    
  +
       /**
        * @return the url specified by the tag, either the url if not null, or
        * a combination of the host, port and path
  @@ -88,18 +88,18 @@
               return "http://" + host + getPath();
           }
       }
  -    
  +
       /**
  -     * A method that must be implemented by subclasses to provide the 
  +     * A method that must be implemented by subclasses to provide the
        * {@link HttpMethod url method} implementation
        *
        * @return a HttpUrlMethod implementation
  -     * @throws MalformedURLException when the {@link getUrl() url} or 
  +     * @throws MalformedURLException when the {@link getUrl() url} or
        * {@link #getPath() path} is invalid
        */
  -    protected abstract HttpMethod getHttpMethod() 
  +    protected abstract HttpMethod getHttpMethod()
           throws MalformedURLException;
  -    
  +
       /**
        * Perform the tag functionality. In this case, get the http url method
        * execute it and make it available for validation
  @@ -112,12 +112,12 @@
           invokeBody(xmlOutput);
   
           // track request execution
  -        long start = System.currentTimeMillis();        
  +        long start = System.currentTimeMillis();
           HttpMethod urlMethod = null;
           try {
               urlMethod = getConfiguredHttpMethod();
               getHttpClient().executeMethod(urlMethod);
  -        } 
  +        }
           catch (MalformedURLException e) {
               throw new JellyTagException(e);
           }
  @@ -125,23 +125,23 @@
               throw new JellyTagException(e);
           }
           long end = System.currentTimeMillis();
  -        
  +
           // set variable to value
           if (getVar() != null) {
               getContext().setVariable(getVar(), urlMethod);
  -            getContext().setVariable(getVar() + ".responseTime", 
  +            getContext().setVariable(getVar() + ".responseTime",
                   String.valueOf(end - start));
           }
       }
   
  -    /** 
  -     * retrieve the {@link HttpUrlMethod method} from the subclass and 
  +    /**
  +     * retrieve the {@link HttpUrlMethod method} from the subclass and
        * configure it ready for execution
        *
        * @return a configured {@link HttpUrlMethod method}
        * @throws MalformedURLException when retrieving the URL fails
        */
  -    private HttpMethod getConfiguredHttpMethod() throws 
  +    private HttpMethod getConfiguredHttpMethod() throws
       MalformedURLException {
           // retrieve and configure url method
           HttpMethod urlMethod = getHttpMethod();
  @@ -156,23 +156,23 @@
           setParameters(urlMethod);
           // add the default user agent to the list if one doesn't exist
           // and the session tag does exist and have a user agent
  -        if (urlMethod.getRequestHeader(HttpTagSupport.HEADER_NAME_USER_AGENT) 
  +        if (urlMethod.getRequestHeader(HttpTagSupport.HEADER_NAME_USER_AGENT)
               == null && getSessionTag() != null
               && getSessionTag().getUserAgent() != null) {
  -                
  +
               urlMethod.addRequestHeader(HttpTagSupport.HEADER_NAME_USER_AGENT,
                       getSessionTag().getUserAgent());
           }
           return urlMethod;
       }
  -    
  -    /** 
  +
  +    /**
        * Set the current parameters on the url method ready for processing
        *
        * @param method the {@link HttpUrlMethod method} to configure
        * @throws MalformedURLException when {@link #getHttpUrlMethod()} does
        */
  -    protected void setParameters(HttpMethod method) throws 
  +    protected void setParameters(HttpMethod method) throws
       MalformedURLException {
           if (getParameters().size() > 0) {
               NameValuePair[] parameters = (NameValuePair[]) getParameters().
  @@ -180,7 +180,7 @@
               method.setQueryString(parameters);
           }
       }
  -    
  +
       /**
        * retrieve the optional parent session tag
        *
  @@ -210,7 +210,7 @@
           }
           return client;
       }
  -    
  +
       /**
        * Add a parameter to the list
        *
  @@ -220,7 +220,7 @@
       public void addParameter(String name, String value) {
           getParameters().add(new NameValuePair(name, value));
       }
  -    
  +
       /**
        * Add a request header to the list
        *
  @@ -230,11 +230,11 @@
       public void addRequestHeader(String name, String value) {
           getRequestHeaders().add(new NameValuePair(name, value));
       }
  -    
  +
       //--------------------------------------------------------------------------
       // Property accessors/mutators
       //--------------------------------------------------------------------------
  -    
  +
       /**
        * Getter for property var.
        *
  @@ -243,7 +243,7 @@
       public String getVar() {
           return _var;
       }
  -    
  +
       /**
        * Setter for property var.
        *
  @@ -253,7 +253,7 @@
           _var = var;
       }
   
  -    /** 
  +    /**
        * Getter for property path.
        *
        * @return Value of property path.
  @@ -261,7 +261,7 @@
       public String getPath() {
           return _path;
       }
  -    
  +
       /**
        * Setter for property path.
        *
  @@ -270,7 +270,7 @@
       public void setPath(String path) {
           _path = path;
       }
  -    
  +
       /**
        * Getter for property uri.
        *
  @@ -279,7 +279,7 @@
       public String getUri() {
           return _uri;
       }
  -    
  +
       /**
        * Setter for property uri.
        *
  @@ -288,7 +288,7 @@
       public void setUri(String uri) {
           _uri = uri;
       }
  -    
  +
       /**
        * Getter for property followRedirects.
        *
  @@ -297,7 +297,7 @@
       public boolean isFollowRedirects() {
           return _followRedirects;
       }
  -    
  +
       /**
        * Setter for property followRedirects.
        *
  @@ -306,7 +306,7 @@
       public void setFollowRedirects(boolean followRedirects) {
           _followRedirects = followRedirects;
       }
  -    
  +
       /**
        * Getter for property parameters.
        *
  @@ -315,7 +315,7 @@
       public List getParameters() {
           return _parameters;
       }
  -    
  +
       /**
        * Setter for property parameters.
        *
  @@ -324,7 +324,7 @@
       public void setParameters(List parameters) {
           _parameters = parameters;
       }
  -    
  +
       /**
        * Getter for property requestHeaders.
        *
  @@ -333,8 +333,8 @@
       public List getRequestHeaders() {
           return _requestHeaders;
       }
  -    
  -    /** 
  +
  +    /**
        * Setter for property requestHeaders.
        *
        * @param requestHeaders New value of property requestHeaders.
  @@ -342,5 +342,5 @@
       public void setRequestHeaders(List requestHeaders) {
           _requestHeaders = requestHeaders;
       }
  -    
  +
   }
  
  
  
  1.6       +7 -7      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/OptionsTag.java
  
  Index: OptionsTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/OptionsTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- OptionsTag.java	25 Feb 2004 01:31:51 -0000	1.5
  +++ OptionsTag.java	9 Sep 2004 12:08:26 -0000	1.6
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,16 +28,16 @@
    * @version $Id$
    */
   public class OptionsTag extends HttpTagSupport {
  -    
  +
       /** the options method */
       private OptionsMethod _optionsMethod;
  -    
  +
       /**
        * Creates a new instance of OptionsTag
        */
       public OptionsTag() {
       }
  -    
  +
       /**
        * @return a url method for an options request
        * @throws MalformedURLException when the url is bad
  @@ -48,5 +48,5 @@
           }
           return _optionsMethod;
       }
  -        
  +
   }
  
  
  
  1.7       +7 -7      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/GetTag.java
  
  Index: GetTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/GetTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GetTag.java	25 Feb 2004 01:31:51 -0000	1.6
  +++ GetTag.java	9 Sep 2004 12:08:26 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,16 +28,16 @@
    * @version $Id$
    */
   public class GetTag extends HttpTagSupport {
  -    
  +
       /** the get method */
       private GetMethod _getMethod;
  -    
  +
       /**
        * Creates a new instance of GetTag
        */
       public GetTag() {
       }
  -    
  +
       /**
        * @return a url method for a get request
        * @throws MalformedURLException when the url is bad
  @@ -48,5 +48,5 @@
           }
           return _getMethod;
       }
  -        
  +
   }
  
  
  
  1.6       +7 -7      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeadTag.java
  
  Index: HeadTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HeadTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HeadTag.java	25 Feb 2004 01:31:50 -0000	1.5
  +++ HeadTag.java	9 Sep 2004 12:08:26 -0000	1.6
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,16 +28,16 @@
    * @version $Id$
    */
   public class HeadTag extends HttpTagSupport {
  -    
  +
       /** the head method */
       private HeadMethod _headMethod;
  -    
  +
       /**
        * Creates a new instance of HeadTag
        */
       public HeadTag() {
       }
  -    
  +
       /**
        * @return a url method for a Head request
        * @throws MalformedURLException when the url is bad
  @@ -48,5 +48,5 @@
           }
           return _headMethod;
       }
  -        
  +
   }
  
  
  
  1.7       +7 -7      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/DeleteTag.java
  
  Index: DeleteTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/DeleteTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DeleteTag.java	25 Feb 2004 01:31:50 -0000	1.6
  +++ DeleteTag.java	9 Sep 2004 12:08:26 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,16 +28,16 @@
    * @version $Id$
    */
   public class DeleteTag extends HttpTagSupport {
  -    
  +
       /** the delete method */
       private DeleteMethod _deleteMethod;
  -    
  +
       /**
        * Creates a new instance of DeleteTag
        */
       public DeleteTag() {
       }
  -    
  +
       /**
        * @return a url method for a get request
        * @throws MalformedURLException when the url is bad
  @@ -48,5 +48,5 @@
           }
           return _deleteMethod;
       }
  -        
  +
   }
  
  
  
  1.6       +9 -9      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/ParameterTag.java
  
  Index: ParameterTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/ParameterTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ParameterTag.java	25 Feb 2004 01:31:51 -0000	1.5
  +++ ParameterTag.java	9 Sep 2004 12:08:26 -0000	1.6
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -22,7 +22,7 @@
   
   /**
    * A tag to hold parameters
  - * 
  + *
    * @author  dion
    * @version $Id$
    */
  @@ -31,7 +31,7 @@
       private String _name;
       /** parameter value */
       private String _value;
  -    
  +
       /** Creates a new instance of ParameterTag */
       public ParameterTag() {
       }
  @@ -60,7 +60,7 @@
       public String getName() {
           return _name;
       }
  -    
  +
       /**
        * Setter for property name.
        *
  @@ -69,7 +69,7 @@
       public void setName(String name) {
           _name = name;
       }
  -    
  +
       /**
        * Getter for property value.
        *
  @@ -78,7 +78,7 @@
       public String getValue() {
           return _value;
       }
  -    
  +
       /**
        * Setter for property value.
        *
  @@ -87,5 +87,5 @@
       public void setValue(String value) {
           _value = value;
       }
  -    
  +
   }
  
  
  
  1.5       +13 -13    jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/Proxy.java
  
  Index: Proxy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/Proxy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Proxy.java	25 Feb 2004 01:31:51 -0000	1.4
  +++ Proxy.java	9 Sep 2004 12:08:26 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -17,7 +17,7 @@
   package org.apache.commons.jelly.tags.http;
   
   /**
  - * A class that holds proxy details for a session. 
  + * A class that holds proxy details for a session.
    * At the moment this is a placeholder for two simple properties that may
    * get added to as time goes by
    *
  @@ -25,22 +25,22 @@
    * @version $Id$
    */
   public class Proxy {
  -    
  +
       /** the host to use as a proxy */
       private String _host;
       /** the port to send proxied requests on */
       private int _port;
       /** the port number that represents port is unassigned */
       public static final int PORT_UNSPECIFIED = -1;
  -    
  +
       /**
        * Creates a new instance of Proxy
        */
       public Proxy() {
           this(null, Proxy.PORT_UNSPECIFIED);
       }
  -    
  -    /** 
  +
  +    /**
        * Create a proxy given a host name and port number .
        *
        * @param host the host name of the proxy to be used.
  @@ -50,7 +50,7 @@
           setHost(host);
           setPort(port);
       }
  -    
  +
       /**
        * Getter for property host.
        *
  @@ -59,7 +59,7 @@
       public String getHost() {
           return _host;
       }
  -    
  +
       /**
        * Setter for property host.
        *
  @@ -68,7 +68,7 @@
       public void setHost(String host) {
           _host = host;
       }
  -    
  +
       /**
        * Getter for property port.
        *
  @@ -77,7 +77,7 @@
       public int getPort() {
           return _port;
       }
  -    
  +
       /**
        * Setter for property port.
        *
  @@ -86,5 +86,5 @@
       public void setPort(int port) {
           _port = port;
       }
  -    
  +
   }
  
  
  
  1.7       +8 -8      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/BodyTag.java
  
  Index: BodyTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/BodyTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BodyTag.java	25 Feb 2004 01:31:50 -0000	1.6
  +++ BodyTag.java	9 Sep 2004 12:08:26 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -32,11 +32,11 @@
    * @version $Id$
    */
   public class BodyTag extends TagSupport {
  -    
  +
       /** Creates a new instance of BodyTag */
       public BodyTag() {
       }
  -    
  +
       /**
        * Perform the tag functionality. In this case, get the parent http tag,
        * and if it's a post or put, set the request body from the body of this
  @@ -48,14 +48,14 @@
       public void doTag(XMLOutput xmlOutput) throws JellyTagException {
           HttpTagSupport httpTag = (HttpTagSupport) findAncestorWithClass(
               HttpTagSupport.class);
  -        
  +
           HttpMethod httpMethod = null;
           try {
               httpMethod = httpTag.getHttpMethod();
           } catch (MalformedURLException e) {
               throw new JellyTagException(e);
           }
  -        
  +
           String bodyText = getBodyText();
           if (httpMethod instanceof PostMethod) {
               PostMethod postMethod = (PostMethod) httpMethod;
  @@ -68,5 +68,5 @@
                   + "not post or put");
           }
       }
  -    
  +
   }
  
  
  
  1.7       +28 -28    jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/SessionTag.java
  
  Index: SessionTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/SessionTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SessionTag.java	25 Feb 2004 01:31:50 -0000	1.6
  +++ SessionTag.java	9 Sep 2004 12:08:26 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -27,7 +27,7 @@
    * @author dion
    */
   public class SessionTag extends TagSupport {
  -    
  +
       /** default host for requests */
       private String _host;
       /** default port for requests */
  @@ -40,16 +40,16 @@
       private String _userAgent;
       /** strict compliance */
       private boolean _strictMode = false;
  -    
  +
       /** http client used to store state and execute requests */
       private HttpClient _httpClient;
  -    
  -    /** 
  +
  +    /**
        * Creates a new instance of SessionTag
        */
       public SessionTag() {
       }
  -    
  +
       /**
        * Process the tag
        *
  @@ -63,10 +63,10 @@
           } else {
               _httpClient = new HttpClient();
           }
  -        
  +
           invokeBody(xmlOutput);
       }
  -    
  +
       /**
        * Getter for property httpClient.
        *
  @@ -75,7 +75,7 @@
       public HttpClient getHttpClient() {
           return _httpClient;
       }
  -    
  +
       /**
        * Setter for property httpClient.
        *
  @@ -90,10 +90,10 @@
        * @return true if the {@link #getProxy() proxy} is configured for use
        */
       public boolean isProxyAvailable() {
  -        return getProxy() != null && getProxy().getHost() != null 
  +        return getProxy() != null && getProxy().getHost() != null
               && getProxy().getPort() != Proxy.PORT_UNSPECIFIED;
       }
  -    
  +
       /**
        * Helper method for proxy host property
        *
  @@ -102,7 +102,7 @@
       public String getProxyHost() {
           return getProxy().getHost();
       }
  -    
  +
       /**
        * Helper method for proxy <code>host</code> property
        *
  @@ -111,7 +111,7 @@
       public void setProxyHost(String host) {
           getProxy().setHost(host);
       }
  -    
  +
       /**
        * Helper method for proxy <code>port</code> property
        *
  @@ -120,7 +120,7 @@
       public int getProxyPort() {
           return getProxy().getPort();
       }
  -    
  +
       /**
        * Helper method for proxy <code>port</code> property
        *
  @@ -129,7 +129,7 @@
       public void setProxyPort(int port) {
           getProxy().setPort(port);
       }
  -    
  +
       /**
        * Getter for property host.
        *
  @@ -138,7 +138,7 @@
       public String getHost() {
           return _host;
       }
  -    
  +
       /**
        * Setter for property host.
        *
  @@ -147,21 +147,21 @@
       public void setHost(String host) {
           _host = host;
       }
  -    
  +
       /** Getter for property port.
        * @return Value of property port.
        */
       public String getPort() {
           return _port;
       }
  -    
  +
       /** Setter for property port.
        * @param port New value of property port.
        */
       public void setPort(String port) {
           _port = port;
       }
  -    
  +
       /**
        * Getter for property proxy.
        *
  @@ -170,7 +170,7 @@
       public Proxy getProxy() {
           return _proxy;
       }
  -    
  +
       /**
        * Setter for property proxy.
        *
  @@ -179,7 +179,7 @@
       public void setProxy(Proxy proxy) {
           _proxy = proxy;
       }
  -    
  +
       /**
        * Getter for property secure.
        *
  @@ -188,7 +188,7 @@
       public boolean isSecure() {
           return _secure;
       }
  -    
  +
       /**
        * Setter for property secure.
        *
  @@ -204,26 +204,26 @@
       public String getUserAgent() {
           return _userAgent;
       }
  -    
  +
       /** Setter for property userAgent.
        * @param userAgent New value of property userAgent.
        */
       public void setUserAgent(String userAgent) {
           _userAgent = userAgent;
       }
  -    
  +
       /** Getter for property strictMode.
        * @return Value of property strictMode.
        */
       public boolean isStrictMode() {
           return _strictMode;
       }
  -    
  +
       /** Setter for property strictMode.
        * @param strictMode New value of property strictMode.
        */
       public void setStrictMode(boolean strictMode) {
           _strictMode = strictMode;
       }
  -    
  +
   }
  
  
  
  1.6       +7 -7      jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java
  
  Index: HttpTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/src/java/org/apache/commons/jelly/tags/http/HttpTagLibrary.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HttpTagLibrary.java	25 Feb 2004 01:31:50 -0000	1.5
  +++ HttpTagLibrary.java	9 Sep 2004 12:08:26 -0000	1.6
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -27,8 +27,8 @@
    * @version $Id$
    */
   public class HttpTagLibrary extends TagLibrary {
  -    
  -    /** 
  +
  +    /**
        * Creates a new instance of LatkaTagLibrary
        */
       public HttpTagLibrary() {
  @@ -43,7 +43,7 @@
           registerTag("header", HeaderTag.class);
           registerTag("body", BodyTag.class);
       }
  -    
  +
       /**
        * @see TagLibarary#getTagClasses()
        *
  @@ -52,6 +52,6 @@
       public Map getTagClasses() {
           return super.getTagClasses();
       }
  -    
  +
   }
   
  
  
  

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


Mime
View raw message