cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/lib jars.xml
Date Thu, 09 Jan 2003 15:49:43 GMT
cziegeler    2003/01/09 07:49:43

  Modified:    src/java/org/apache/cocoon/generation
                        WebServiceProxyGenerator.java
               lib      jars.xml
  Added:       lib/optional commons-httpclient-20030108.jar
  Removed:     lib/optional commons-httpclient.jar
  Log:
  Updating to the latest httpcommons version to avoid gump problems
  
  Revision  Changes    Path
  1.1                  xml-cocoon2/lib/optional/commons-httpclient-20030108.jar
  
  	<<Binary file>>
  
  
  1.7       +13 -9     xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
  
  Index: WebServiceProxyGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebServiceProxyGenerator.java	7 Jan 2003 23:17:09 -0000	1.6
  +++ WebServiceProxyGenerator.java	9 Jan 2003 15:49:42 -0000	1.7
  @@ -65,7 +65,8 @@
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.commons.httpclient.HttpMultiClient;
  +import org.apache.commons.httpclient.HostConfiguration;
  +import org.apache.commons.httpclient.HttpClient;
   import org.apache.commons.httpclient.HttpUrlMethod;
   import org.apache.commons.httpclient.NameValuePair;
   import org.apache.commons.httpclient.methods.UrlGetMethod;
  @@ -287,26 +288,29 @@
    * consequetively return an HttpMultiClient
    *
    */
  -protected HttpMultiClient getHttpClient()
  +protected HttpClient getHttpClient()
   {
     Request request = ObjectModelHelper.getRequest( objectModel );
     Session session = request.getSession( true );
  -  HttpMultiClient httpClient = null;
  +  HttpClient httpClient = null;
     if (session != null)
     {
  -    httpClient = (HttpMultiClient) session.getAttribute( HTTP_CLIENT );
  +    httpClient = (HttpClient) session.getAttribute( HTTP_CLIENT );
     }
     if (httpClient == null)
     {
  -    httpClient = new HttpMultiClient();
  +    httpClient = new HttpClient();
       
       if (System.getProperty("http.proxyHost") != null)
       {
         String proxyHost = System.getProperty("http.proxyHost");
         int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
  -      
  -      httpClient.setProxyHost( proxyHost );
  -      httpClient.setProxyPort( proxyPort );
  +      HostConfiguration config = httpClient.getHostConfiguration();
  +      if (config == null) {
  +        config = new HostConfiguration();
  +      }
  +      config.setProxy(proxyHost, proxyPort);
  +      httpClient.setHostConfiguration(config);
       }
       
       session.setAttribute( HTTP_CLIENT, httpClient );
  @@ -316,7 +320,7 @@
   
   // private attributes section
   private static String HTTP_CLIENT = "HTTP_CLIENT";
  -private HttpMultiClient httpClient;
  +private HttpClient httpClient;
   
   // for GET/POST configurability
   private static String METHOD_GET = "GET";
  
  
  
  1.63      +1 -1      xml-cocoon2/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- jars.xml	9 Jan 2003 08:09:40 -0000	1.62
  +++ jars.xml	9 Jan 2003 15:49:43 -0000	1.63
  @@ -306,7 +306,7 @@
         and feature-rich package implementing the client side of the most recent
         HTTP standards and recommendations.</description>
   	<used-by>SOAP logicsheet, WebServiceProxyGenerator</used-by>
  -	<lib>optional/commons-httpclient.jar</lib>
  +	<lib>optional/commons-httpclient-20030108.jar</lib>
   	<homepage>http://jakarta.apache.org/commons/httpclient/</homepage>
    </file>
    <file>
  
  
  

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