summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAlex Boone2012-01-17 15:19:51 (EST)
committer John Arthorne2012-01-17 15:21:26 (EST)
commit9e7c0c625a1db351640448f5c40f94da4d998154 (patch)
tree632383f9343b59bfbf1de09e2bdd290c632d43a9
parent301d9e226a67ddc0e540c42f5387498f9aae1358 (diff)
downloadorg.eclipse.orion.server-9e7c0c625a1db351640448f5c40f94da4d998154.zip
org.eclipse.orion.server-9e7c0c625a1db351640448f5c40f94da4d998154.tar.gz
org.eclipse.orion.server-9e7c0c625a1db351640448f5c40f94da4d998154.tar.bz2
Bug 368061 - Unable to bind Orion server to specific IP addressv20120117-2021
-rw-r--r--bundles/org.eclipse.orion.server.configurator/src/org/eclipse/orion/server/configurator/ConfiguratorActivator.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/bundles/org.eclipse.orion.server.configurator/src/org/eclipse/orion/server/configurator/ConfiguratorActivator.java b/bundles/org.eclipse.orion.server.configurator/src/org/eclipse/orion/server/configurator/ConfiguratorActivator.java
index 655d0b9..3caa7de 100644
--- a/bundles/org.eclipse.orion.server.configurator/src/org/eclipse/orion/server/configurator/ConfiguratorActivator.java
+++ b/bundles/org.eclipse.orion.server.configurator/src/org/eclipse/orion/server/configurator/ConfiguratorActivator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others
+ * Copyright (c) 2010, 2012 IBM Corporation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat - Fix for bug 368061
*******************************************************************************/
package org.eclipse.orion.server.configurator;
@@ -126,6 +127,11 @@ public class ConfiguratorActivator implements BundleActivator {
properties.put(JettyConstants.SSL_PASSWORD, preferences.get(SSL_PASSWORD, "password")); //$NON-NLS-1$
properties.put(JettyConstants.SSL_KEYPASSWORD, preferences.get(SSL_KEYPASSWORD, "password")); //$NON-NLS-1$
properties.put(JettyConstants.SSL_PROTOCOL, preferences.get(SSL_PROTOCOL, "SSLv3")); //$NON-NLS-1$
+
+ String httpsHost = System.getProperty("org.eclipse.equinox.http.jetty.https.host"); //$NON-NLS-1$
+ if (httpsHost != null) {
+ properties.put(JettyConstants.HTTPS_HOST, httpsHost);
+ }
}
String port = null;
@@ -133,6 +139,11 @@ public class ConfiguratorActivator implements BundleActivator {
properties.put(JettyConstants.HTTP_ENABLED, true);
port = preferences.get(HTTP_PORT, System.getProperty("org.eclipse.equinox.http.jetty.http.port", "8080"));//$NON-NLS-1$ //$NON-NLS-2$
properties.put(JettyConstants.HTTP_PORT, new Integer(port));
+
+ String httpHost = System.getProperty("org.eclipse.equinox.http.jetty.http.host"); //$NON-NLS-1$
+ if (httpHost != null) {
+ properties.put(JettyConstants.HTTP_HOST, httpHost);
+ }
}
//properties to help us filter orion content