Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 04:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #4238 Pass system properties into xml configurations (#4390)

Browse Source 
* Issue #4238 Pass system properties into xml configurations

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2019-12-09 08:33:52 +11:00 committed by GitHub
parent 941ce67e61
commit 9cfaa414a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
View File

@ -26,6 +26,8 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator;
@ -148,9 +150,8 @@ public class DefaultJettyAtJettyHomeHelper
LOG.warn("No default jetty created.");
return null;
}
//configure the server here rather than letting the JettyServerServiceTracker do it, because we want to be able to
//configure the ThreadPool, which can only be done via the constructor, ie from within the xml configuration processing
//resolve the jetty xml config files
List<URL> configURLs = jettyHomeDir != null ? getJettyConfigurationURLs(jettyHomeDir) : getJettyConfigurationURLs(jettyHomeBundle, properties);
LOG.info("Configuring the default jetty server with {}", configURLs);
@ -174,14 +175,36 @@ public class DefaultJettyAtJettyHomeHelper
}
Thread.currentThread().setContextClassLoader(cl);
// these properties usually are the ones passed to this type of
// configuration.
//the default server name
properties.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME);
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")));
//Always set home and base
Util.setProperty(properties, OSGiServerConstants.JETTY_HOME, home);
Util.setProperty(properties, OSGiServerConstants.JETTY_BASE, base);
// copy all system properties starting with "jetty." to service properties for the jetty server service.
// these will be used as xml configuration properties.
for (Map.Entry<Object, Object> prop : System.getProperties().entrySet())
{
if (prop.getKey() instanceof String)
{
String skey = (String)prop.getKey();
//never copy the jetty xml config files into the properties as we pass them explicitly into
//the call to configure, also we set home and base explicitly
if (OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS.equals(skey) ||
OSGiServerConstants.JETTY_HOME.equals(skey) ||
OSGiServerConstants.JETTY_BASE.equals(skey))
continue;
if (skey.startsWith("jetty."))
{
Util.setProperty(properties, skey, prop.getValue());
}
}
}
//configure the server here rather than letting the JettyServerServiceTracker do it, because we want to be able to
//configure the ThreadPool, which can only be done via the constructor, ie from within the xml configuration processing
Server server = ServerInstanceWrapper.configure(null, configURLs, properties);
//Register the default Server instance as an OSGi service.