[Smartfrog-checkins] SF.net SVN: smartfrog: [6247] trunk/core/components/ec2/src/org/smartfrog/ services/restlet/overrides/ProxyEnabledHttpClientHelper.java

[<st...@us...>]

Revision: 6247
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6247&view=rev
Author:   steve_l
Date:     2008-03-25 09:43:38 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
SFOS-744 	 Add component to deploy/terminate EC2 VMs
We use proxy settings in so many places they should be defined

Modified Paths:
--------------
    trunk/core/components/ec2/src/org/smartfrog/services/restlet/overrides/ProxyEnabledHttpClientHelper.java

Modified: trunk/core/components/ec2/src/org/smartfrog/services/restlet/overrides/ProxyEnabledHttpClientHelper.java
===================================================================
--- trunk/core/components/ec2/src/org/smartfrog/services/restlet/overrides/ProxyEnabledHttpClientHelper.java	2008-03-25 16:43:16 UTC (rev 6246)
+++ trunk/core/components/ec2/src/org/smartfrog/services/restlet/overrides/ProxyEnabledHttpClientHelper.java	2008-03-25 16:43:38 UTC (rev 6247)
@@ -28,6 +28,7 @@
 import org.restlet.data.Request;
 import org.smartfrog.sfcore.logging.Log;
 import org.smartfrog.sfcore.logging.LogFactory;
+import org.smartfrog.services.www.HttpProxyProperties;
 
 /**
  *
@@ -123,7 +124,7 @@
      * @return true iff the proxy is enabled
      */
     public boolean bindToSystemProxySettings() {
-        proxyHost = System.getProperty("http.proxyHost");
+        proxyHost = System.getProperty(HttpProxyProperties.HTTP_PROXY_HOST);
         if (proxyHost != null) {
             if (proxyHost.length() == 0) {
                 proxyHost = null;
@@ -132,9 +133,9 @@
         if (!isEnabled()) {
             return false;
         }
-        proxyPort = Integer.parseInt(System.getProperty("http.proxyPort", "80"));
-        proxyUser = System.getProperty("http.proxyUser");
-        proxyPassword = System.getProperty("proxyPassword");
+        proxyPort = Integer.parseInt(System.getProperty(HttpProxyProperties.HTTP_PROXY_PORT, "80"));
+        proxyUser = System.getProperty(HttpProxyProperties.HTTP_PROXY_USER);
+        proxyPassword = System.getProperty(HttpProxyProperties.HTTP_PROXY_PASSWORD);
         if(log.isDebugEnabled()) {
             log.debug("Binding to proxy " + proxyHost + ':' + proxyPort);
         }
@@ -142,7 +143,7 @@
     }
 
     /**
-     * configure an HTTP client from the settinsg
+     * configure an HTTP client from the settings
      *
      * @param client client to configure
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.