← Back to branch summary

~ubuntu-core-dev/ubuntu/maverick/eucalyptus/devel

« back to all changes in this revision

Viewing changes to clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java

  • Committer: Dustin Kirkland
  • Date: 2010-07-22 08:41:57 UTC
  • mfrom: (1050.1.19 ubuntu)
  • Revision ID: kirkland@x200-20100722084157-zh2p8dkawznvxxpn
Approving Dave Walker's merge of new upstream Eucalyptus 2.0 release.

Dustin Kirkland <kirkland@canonical.com>

* New major upstream version merge, 2.0 (r1211).
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/server/EucalyptusWebBackendImpl.java
70
70
import com.eucalyptus.auth.UserInfo;
71
71
import com.eucalyptus.auth.Users;
72
72
import com.eucalyptus.auth.principal.User;
73
 
import com.eucalyptus.auth.util.Hashes;
 
73
import com.eucalyptus.bootstrap.HttpServerBootstrapper;
74
74
import com.eucalyptus.component.Component;
75
75
import com.eucalyptus.component.Components;
76
76
import com.eucalyptus.component.Service;
844
844
 
845
845
                HttpClient httpClient = new HttpClient();
846
846
                //support for http proxy
847
 
                if(System.getProperty("http.proxyHost") != null) {
848
 
                        String proxyHost = System.getProperty("http.proxyHost");
849
 
                        if(System.getProperty("http.proxyPort") != null) {
850
 
                                int proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
 
847
                if(HttpServerBootstrapper.httpProxyHost != null && (HttpServerBootstrapper.httpProxyHost.length() > 0)) {
 
848
                        String proxyHost = HttpServerBootstrapper.httpProxyHost;
 
849
                        if(HttpServerBootstrapper.httpProxyPort != null &&  (HttpServerBootstrapper.httpProxyPort.length() > 0)) {
 
850
                                int proxyPort = Integer.parseInt(HttpServerBootstrapper.httpProxyPort);
851
851
                                httpClient.getHostConfiguration().setProxy(proxyHost, proxyPort);
852
852
                        } else {
853
853
                                httpClient.getHostConfiguration().setProxyHost(new ProxyHost(proxyHost));