diff options
author | Jan Bartel | 2013-02-21 10:39:07 +0000 |
---|---|---|
committer | Jan Bartel | 2013-02-21 10:39:07 +0000 |
commit | 1ce132b6d3ec0c4833f4c23c5e3f19f1c101390f (patch) | |
tree | 098f7f72adcf07a7bf33b5995e3ebea8fa5cb154 /jetty-osgi/jetty-osgi-boot/jettyhome | |
parent | f1daea663a2962f5d9d96ed1dda42527ee48c4f6 (diff) | |
parent | 9be9910cdee4e83ecd21e1d0cac54e258147d999 (diff) | |
download | org.eclipse.jetty.project-1ce132b6d3ec0c4833f4c23c5e3f19f1c101390f.tar.gz org.eclipse.jetty.project-1ce132b6d3ec0c4833f4c23c5e3f19f1c101390f.tar.xz org.eclipse.jetty.project-1ce132b6d3ec0c4833f4c23c5e3f19f1c101390f.zip |
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/jettyhome')
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index 7df9ee2d00..1c99835386 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -57,6 +57,20 @@ <!-- =========================================================== --> <!-- 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> + </Call> + <Call class="java.lang.System" name="setProperty"> <Arg>java.naming.factory.initial</Arg> <Arg><Property name="java.naming.factory.initial" default="org.eclipse.jetty.jndi.InitialContextFactory"/></Arg> |