Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

404323 Improved parameterization of https and SPDY

This commit is contained in:
Greg Wilkins 2013-03-28 17:09:29 +11:00
parent 5b3d866a27
commit ea60965803
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-distribution/src/main/resources/start.ini
View File

@ -55,10 +55,6 @@
# jetty.home=.
# jetty.logs=./logs
# jetty.host=0.0.0.0
# jetty.port=8080
# jetty.tls.port=8443
# jetty.jmxrmihost=localhost
# jetty.jmxrmiport=1099
#===========================================================
@ -121,6 +117,8 @@ etc/jetty.xml
# enable --exec or use --exec-print (see above)
#-----------------------------------------------------------
OPTIONS=jmx
# jetty.jmxrmihost=localhost
# jetty.jmxrmiport=1099
# -Dcom.sun.management.jmxremote
etc/jetty-jmx.xml
#===========================================================
@ -144,6 +142,7 @@ OPTIONS=jsp
#===========================================================
# HTTP Connector
#-----------------------------------------------------------
# jetty.port=8080
etc/jetty-http.xml
#===========================================================

15
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View File

@ -1195,16 +1195,19 @@ public class XmlConfiguration
}
}
// For all arguments, load properties or parse XMLs
// For all arguments, load properties
for (int i = 0; i < args.length; i++)
{
if (args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties"))
properties.load(Resource.newResource(args[i]).getInputStream());
}
// For all arguments, parse XMLs
XmlConfiguration last = null;
Object[] obj = new Object[args.length];
for (int i = 0; i < args.length; i++)
{
if (args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties"))
{
properties.load(Resource.newResource(args[i]).getInputStream());
}
else
if (!args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties"))
{
XmlConfiguration configuration = new XmlConfiguration(Resource.newResource(args[i]).getURL());
if (last != null)