Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-04-13 10:21:48 -0400
committerSimone Bordet2015-04-13 10:21:48 -0400
commit599ab9bb1bee454f190d964b67859e46a1e57f87 (patch)
treeb729472f7fc361ec6b84526c74cf193c383e77b7 /jetty-osgi/jetty-osgi-boot/src
parentd78673f8f824d562bf181fe2aaf929bad6f6e695 (diff)
downloadorg.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.gz
org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.xz
org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.zip
460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>". Updated all references with new properties.
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java10
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java16
2 files changed, 12 insertions, 14 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java
index a91af45a83..6b846a7e5d 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java
@@ -43,21 +43,20 @@ public class OSGiServerConstants
* Usual system property used as the hostname for a typical jetty
* configuration.
*/
- public static final String JETTY_HOST = "jetty.host";
+ public static final String JETTY_HOST = "jetty.http.host";
/**
* Usual system property used as the port for http for a typical jetty
* configuration.
*/
- public static final String JETTY_PORT = "jetty.port";
+ public static final String JETTY_PORT = "jetty.http.port";
/**
* Usual system property used as the port for https for a typical jetty
* configuration.
*/
- public static final String JETTY_PORT_SSL = "ssl.port";
-
-
+ public static final String JETTY_PORT_SSL = "jetty.ssl.port";
+
//for managed jetty instances, name of the configuration parameters
/**
* PID of the jetty servers's ManagedFactory
@@ -86,5 +85,4 @@ public class OSGiServerConstants
* List of URLs to the folders where the legacy J2EE shared libraries are stored aka lib/ext, lib/jsp etc.
*/
public static final String MANAGED_JETTY_SHARED_LIB_FOLDER_URLS = "managedJettySharedLibFolderUrls";
-
}
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
index 48fc6ebb9b..2377f54117 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
@@ -88,8 +88,8 @@ public class DefaultJettyAtJettyHomeHelper
* files.
* </p>
* <p>
- * In both cases the system properties jetty.host, jetty.port and
- * jetty.port.ssl are passed to the configuration files that might use them
+ * In both cases the system properties jetty.http.host, jetty.http.port and
+ * jetty.ssl.port are passed to the configuration files that might use them
* as part of their properties.
* </p>
*/
@@ -158,7 +158,7 @@ public class DefaultJettyAtJettyHomeHelper
String home=properties.get(OSGiServerConstants.JETTY_HOME);
String base=properties.get(OSGiServerConstants.JETTY_BASE);
if (base==null)
- base=home;
+ base=home;
LOG.info("JETTY.HOME="+home);
LOG.info("JETTY.BASE="+base);
ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
@@ -169,9 +169,9 @@ public class DefaultJettyAtJettyHomeHelper
// these properties usually are the ones passed to this type of
// configuration.
properties.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME);
- Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST));
- Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT));
- Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL));
+ Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST, System.getProperty("jetty.host")));
+ Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT, System.getProperty("jetty.port")));
+ Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL, System.getProperty("ssl.port")));
Util.setProperty(properties, OSGiServerConstants.JETTY_HOME, home);
Util.setProperty(properties, OSGiServerConstants.JETTY_BASE, base);
Server server = ServerInstanceWrapper.configure(null, configURLs, properties);
@@ -185,8 +185,8 @@ public class DefaultJettyAtJettyHomeHelper
}
catch (Exception e)
{
- LOG.warn(e);
- throw e;
+ LOG.warn(e);
+ throw e;
}
finally
{

Back to the top