diff options
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml')
| -rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index 5c882b0514..a3850c9259 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!-- =============================================================== --> @@ -43,7 +43,7 @@ <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme">https</Set> - <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set> + <Set name="securePort"><Property name="jetty.httpConfig.securePort" default="8443" /></Set> <Set name="outputBufferSize">32768</Set> <Set name="requestHeaderSize">8192</Set> <Set name="responseHeaderSize">8192</Set> @@ -63,21 +63,25 @@ <!-- =========================================================== --> - <!-- jetty-jndi by default --> - <!-- =========================================================== --> - <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault"> - <Arg><Ref refid="Server" /></Arg> - <Call name="addAfter"> - <Arg name="afterClass">org.eclipse.jetty.webapp.FragmentConfiguration</Arg> - <Arg> - <Array type="String"> - <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> - <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item> - <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item> - </Array> - </Arg> - </Call> + <!-- Set up the list of default configuration classes --> + <!-- =========================================================== --> + <Call name="setAttribute"> + <Arg>org.eclipse.jetty.webapp.configuration</Arg> + <Arg> + <New class="org.eclipse.jetty.webapp.Configuration$ClassList"> + <Arg> + <Array type="String"> + <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> + <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item> + <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item> + <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item> + <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item> + </Array> + </Arg> + </New> + </Arg> </Call> + <Call class="java.lang.System" name="setProperty"> <Arg>java.naming.factory.initial</Arg> |