Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2016-01-05 10:50:52 +0000
committerSimone Bordet2016-01-05 10:50:52 +0000
commit6128bd6d454ccd9b78f97206add7f03f7be8f09b (patch)
tree4ff8b334e74c3f06afe52deba93fccb811510b8f /jetty-osgi
parent4032b8579a665211a98e28ca716ed725043df31f (diff)
parentf519aa28fbb40a28fd244a4bb1d7f613a69eb80a (diff)
downloadorg.eclipse.jetty.project-6128bd6d454ccd9b78f97206add7f03f7be8f09b.tar.gz
org.eclipse.jetty.project-6128bd6d454ccd9b78f97206add7f03f7be8f09b.tar.xz
org.eclipse.jetty.project-6128bd6d454ccd9b78f97206add7f03f7be8f09b.zip
Merged branch 'jetty-9.3.x' into 'master'.
Diffstat (limited to 'jetty-osgi')
-rw-r--r--jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml20
1 files changed, 3 insertions, 17 deletions
diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
index e1044c88bc..98c00314b9 100644
--- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
@@ -1,31 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<!--
- Copyright (c) 2009-2011 Intalio, Inc.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- and Apache License v2.0 which accompanies this distribution.
- The Eclipse Public License is available at
- http://www.eclipse.org/legal/epl-v10.html
- The Apache License v2.0 is available at
- http://www.opensource.org/licenses/apache2.0.php
- You may elect to redistribute this code under either of these licenses.
- Contributors:
- Hugues Malphettes - initial API and implementation
--->
<Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
-<!-- this configures the servlet session manager -->
+ <!-- this configures the servlet session manager -->
<Set name="SessionHandler">
<New class="org.eclipse.jetty.server.session.SessionHandler"/>
</Set>
-<!-- this servlet provides the OSGi HTTP Service once it is initialized -->
+ <!-- this servlet provides the OSGi HTTP Service once it is initialized -->
<Call name="addServlet">
<Arg>org.eclipse.equinox.http.servlet.HttpServiceServlet</Arg>
<Arg>/*</Arg>
<Set name="InitOrder">1</Set>
</Call>
-<!-- custom pluggable error handler -->
+ <!-- custom pluggable error handler -->
<Set name="ErrorHandler">
<New class="org.eclipse.jetty.osgi.httpservice.HttpServiceErrorPageErrorHandler"/>
</Set>

Back to the top