Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
XWIKI-8904: Upgrade Jetty to version 9.2.3.v20140905
- Loading branch information
Showing
35 changed files
with
1,004 additions
and
267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 0 additions & 47 deletions
47
...ty/xwiki-platform-tool-jetty-resources/src/main/resources/jetty/etc/jetty-02-contexts.xml
This file was deleted.
Oops, something went wrong.
92 changes: 0 additions & 92 deletions
92
...wiki-platform-tool-jetty-resources/src/main/resources/jetty/etc/jetty-10-ssl.xml.disabled
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...ool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/jetty/etc/jetty-http.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> | ||
|
|
||
| <!-- ============================================================= --> | ||
| <!-- Configure the Jetty Server instance with an ID "Server" --> | ||
| <!-- by adding a HTTP connector. --> | ||
| <!-- This configuration must be used in conjunction with jetty.xml --> | ||
| <!-- ============================================================= --> | ||
| <Configure id="Server" class="org.eclipse.jetty.server.Server"> | ||
|
|
||
| <!-- =========================================================== --> | ||
| <!-- Add a HTTP Connector. --> | ||
| <!-- Configure an o.e.j.server.ServerConnector with a single --> | ||
| <!-- HttpConnectionFactory instance using the common httpConfig --> | ||
| <!-- instance defined in jetty.xml --> | ||
| <!-- --> | ||
| <!-- Consult the javadoc of o.e.j.server.ServerConnector and --> | ||
| <!-- o.e.j.server.HttpConnectionFactory for all configuration --> | ||
| <!-- that may be set here. --> | ||
| <!-- =========================================================== --> | ||
| <Call name="addConnector"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.ServerConnector"> | ||
| <Arg name="server"><Ref refid="Server" /></Arg> | ||
| <Arg name="acceptors" type="int"><Property name="http.acceptors" default="-1"/></Arg> | ||
| <Arg name="selectors" type="int"><Property name="http.selectors" default="-1"/></Arg> | ||
| <Arg name="factories"> | ||
| <Array type="org.eclipse.jetty.server.ConnectionFactory"> | ||
| <Item> | ||
| <New class="org.eclipse.jetty.server.HttpConnectionFactory"> | ||
| <Arg name="config"><Ref refid="httpConfig" /></Arg> | ||
| </New> | ||
| </Item> | ||
| </Array> | ||
| </Arg> | ||
| <Set name="host"><Property name="jetty.host" /></Set> | ||
| <Set name="port"><Property name="jetty.port" default="8080" /></Set> | ||
| <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set> | ||
| <Set name="soLingerTime"><Property name="http.soLingerTime" default="-1"/></Set> | ||
| <Set name="acceptorPriorityDelta"><Property name="http.acceptorPriorityDelta" default="0"/></Set> | ||
| <Set name="selectorPriorityDelta"><Property name="http.selectorPriorityDelta" default="0"/></Set> | ||
| </New> | ||
| </Arg> | ||
| </Call> | ||
|
|
||
| </Configure> |
73 changes: 73 additions & 0 deletions
73
...ol-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/jetty/etc/jetty-https.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> | ||
|
|
||
| <!-- ============================================================= --> | ||
| <!-- Configure a HTTPS connector. --> | ||
| <!-- This configuration must be used in conjunction with jetty.xml --> | ||
| <!-- and jetty-ssl.xml. --> | ||
| <!-- ============================================================= --> | ||
| <Configure id="Server" class="org.eclipse.jetty.server.Server"> | ||
|
|
||
| <!-- =========================================================== --> | ||
| <!-- Add a HTTPS Connector. --> | ||
| <!-- Configure an o.e.j.server.ServerConnector with connection --> | ||
| <!-- factories for TLS (aka SSL) and HTTP to provide HTTPS. --> | ||
| <!-- All accepted TLS connections are wired to a HTTP connection.--> | ||
| <!-- --> | ||
| <!-- Consult the javadoc of o.e.j.server.ServerConnector, --> | ||
| <!-- o.e.j.server.SslConnectionFactory and --> | ||
| <!-- o.e.j.server.HttpConnectionFactory for all configuration --> | ||
| <!-- that may be set here. --> | ||
| <!-- =========================================================== --> | ||
| <Call id="httpsConnector" name="addConnector"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.ServerConnector"> | ||
| <Arg name="server"><Ref refid="Server" /></Arg> | ||
| <Arg name="acceptors" type="int"><Property name="ssl.acceptors" default="-1"/></Arg> | ||
| <Arg name="selectors" type="int"><Property name="ssl.selectors" default="-1"/></Arg> | ||
| <Arg name="factories"> | ||
| <Array type="org.eclipse.jetty.server.ConnectionFactory"> | ||
| <Item> | ||
| <New class="org.eclipse.jetty.server.SslConnectionFactory"> | ||
| <Arg name="next">http/1.1</Arg> | ||
| <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg> | ||
| </New> | ||
| </Item> | ||
| <Item> | ||
| <New class="org.eclipse.jetty.server.HttpConnectionFactory"> | ||
| <Arg name="config"><Ref refid="sslHttpConfig"/></Arg> | ||
| </New> | ||
| </Item> | ||
| </Array> | ||
| </Arg> | ||
| <Set name="host"><Property name="jetty.host" /></Set> | ||
| <Set name="port"><Property name="https.port" default="8443" /></Set> | ||
| <Set name="idleTimeout"><Property name="https.timeout" default="30000"/></Set> | ||
| <Set name="soLingerTime"><Property name="https.soLingerTime" default="-1"/></Set> | ||
| <Set name="acceptorPriorityDelta"><Property name="ssl.acceptorPriorityDelta" default="0"/></Set> | ||
| <Set name="selectorPriorityDelta"><Property name="ssl.selectorPriorityDelta" default="0"/></Set> | ||
| </New> | ||
| </Arg> | ||
| </Call> | ||
| </Configure> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.