Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 17:06:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

jetty-9 more xml configuration

Browse Source
This commit is contained in:
Greg Wilkins 2012-09-13 15:30:07 +10:00
parent 9940796a32
commit e596d6eef6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example-jetty-embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
View File

@ -9,7 +9,7 @@ public class TestXml
System.setProperty("jetty.home","../jetty-distribution/target/distribution");
XmlConfiguration.main(new String[]
{
"../jetty-jmx/src/main/config/etc/jetty-jmx.xml",
// "../jetty-jmx/src/main/config/etc/jetty-jmx.xml",
"../jetty-server/src/main/config/etc/jetty.xml",
"../jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml"
}

2
jetty-plus/src/main/config/100-jetty-plus.ini
View File

@ -1,2 +0,0 @@
OPTIONS=plus
etc/jetty-plus.xml

2
jetty-plus/src/main/config/start.d
View File

@ -0,0 +1,2 @@
OPTIONS=plus
etc/jetty-plus.xml

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

@ -785,7 +785,7 @@ public class XmlConfiguration
{
String id = node.getAttribute("id");
obj = _idMap.get(id);
if (obj == null)
if (obj == null && node.size()>0)
throw new IllegalStateException("No object for id=" + id);
configure(obj,node,0);
return obj;