← Back to branch summary

~graziano.obertelli/eucalyptus/lp683800

« back to all changes in this revision

Viewing changes to clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java

  • Committer: Dmitrii Zagorodnov
  • Date: 2010-07-30 01:05:08 UTC
  • mfrom: (1195.1.61 main)
  • mto: (1195.1.86 main)
  • mto: This revision was merged to the branch mainline in revision 1217.
  • Revision ID: dmitrii@eucalyptus.com-20100730010508-k9h1jyx044uorx9x
enabling iscsi use without sudoers modification via euca_rootwrap, which had to change

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/www/src/main/java/com/eucalyptus/bootstrap/HttpServerBootstrapper.java
86
86
  public static Integer HTTP_PORT  = 8080;
87
87
  private static Server jettyServer;
88
88
  private static Thread serverThread;
89
 
  
 
89
  @ConfigurableField( initial = "", description = "Http Proxy Host" )
 
90
  public static String httpProxyHost;
 
91
  @ConfigurableField( initial = "", description = "Http Proxy Port" )
 
92
  public static String httpProxyPort;
 
93
 
90
94
  private static void setupJettyServer( ) throws Exception {
91
 
    jettyServer = new org.mortbay.jetty.Server( );
 
95
    //http proxy setup
 
96
        if(System.getProperty("http.proxyHost") != null) {
 
97
                httpProxyHost = System.getProperty("http.proxyHost");
 
98
        }
 
99
        if(System.getProperty("http.proxyPort") != null) {
 
100
                httpProxyPort = System.getProperty("http.proxyPort");
 
101
        } 
 
102
        jettyServer = new org.mortbay.jetty.Server( );
92
103
    System.setProperty( "euca.http.port", "" + HTTP_PORT );
93
104
    System.setProperty( "euca.https.port", "" + HTTPS_PORT );
94
105
    URL defaultConfig = ClassLoader.getSystemResource( "eucalyptus-jetty.xml" );