-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/10.0.x' into 11.0.x
- Loading branch information
Showing
14 changed files
with
631 additions
and
0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| This list of XML to use, and the order to use them in, was obtained from using jetty-home. | ||
|
|
||
| ``` shell | ||
| [tmp]$ mkdir ssl10 | ||
| [ssl10]$ cd ssl10 | ||
| [ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --create-start-ini --add-modules=http,https,requestlog | ||
| INFO : create ${jetty.base}/start.ini | ||
| INFO : server transitively enabled, ini template available with --add-module=server | ||
| INFO : logging-jetty transitively enabled | ||
| INFO : requestlog initialized in ${jetty.base}/start.ini | ||
| INFO : http initialized in ${jetty.base}/start.ini | ||
| INFO : resources transitively enabled | ||
| INFO : https initialized in ${jetty.base}/start.ini | ||
| INFO : threadpool transitively enabled, ini template available with --add-module=threadpool | ||
| INFO : ssl transitively enabled, ini template available with --add-module=ssl | ||
| INFO : logging/slf4j transitive provider of logging/slf4j for logging-jetty | ||
| INFO : logging/slf4j dynamic dependency of logging-jetty | ||
| INFO : bytebufferpool transitively enabled, ini template available with --add-module=bytebufferpool | ||
| INFO : mkdir ${jetty.base}/resources | ||
| INFO : copy ${jetty.home}/modules/logging/jetty/resources/jetty-logging.properties to ${jetty.base}/resources/jetty-logging.properties | ||
| INFO : mkdir ${jetty.base}/logs | ||
| INFO : Base directory was modified | ||
|
|
||
| [ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --list-config | ||
|
|
||
| Enabled Modules: | ||
| ---------------- | ||
| 0) resources transitive provider of resources for logging-jetty | ||
| 1) logging/slf4j transitive provider of logging/slf4j for logging-jetty | ||
| dynamic dependency of logging-jetty | ||
| 2) logging-jetty transitive provider of logging for threadpool | ||
| transitive provider of logging for bytebufferpool | ||
| transitive provider of logging for server | ||
| 3) bytebufferpool transitive provider of bytebufferpool for server | ||
| init template available with --add-module=bytebufferpool | ||
| 4) threadpool transitive provider of threadpool for server | ||
| init template available with --add-module=threadpool | ||
| 5) server transitive provider of server for http | ||
| transitive provider of server for ssl | ||
| transitive provider of server for requestlog | ||
| init template available with --add-module=server | ||
| 6) http ${jetty.base}/start.ini | ||
| 7) ssl transitive provider of ssl for https | ||
| init template available with --add-module=ssl | ||
| 8) https ${jetty.base}/start.ini | ||
| 9) requestlog ${jetty.base}/start.ini | ||
|
|
||
| Java Environment: | ||
| ----------------- | ||
| java.home = /home/joakim/java/jvm/jdk-11.0.12+7 (null) | ||
| java.vm.vendor = Eclipse Foundation (null) | ||
| java.vm.version = 11.0.12+7 (null) | ||
| java.vm.name = OpenJDK 64-Bit Server VM (null) | ||
| java.vm.info = mixed mode (null) | ||
| java.runtime.name = OpenJDK Runtime Environment (null) | ||
| java.runtime.version = 11.0.12+7 (null) | ||
| java.io.tmpdir = /tmp (null) | ||
| user.dir = /home/joakim/code/jetty/distros/bases/ssl10 (null) | ||
| user.language = en (null) | ||
| user.country = US (null) | ||
|
|
||
| Jetty Environment: | ||
| ------------------ | ||
| jetty.version = 10.0.7 | ||
| jetty.tag.version = jetty-10.0.7 | ||
| jetty.build = da8a4553af9dd84080931fa0f8c678cd2d60f3d9 | ||
| jetty.home = /opt/jetty-home-10.0.7 | ||
| jetty.base = /home/joakim/code/jetty/distros/bases/ssl10 | ||
|
|
||
| Config Search Order: | ||
| -------------------- | ||
| <command-line> | ||
| ${jetty.base} -> /home/joakim/code/jetty/distros/bases/ssl10 | ||
| ${jetty.home} -> /opt/jetty-home-10.0.7 | ||
|
|
||
| System Properties: | ||
| ------------------ | ||
| (no system properties specified) | ||
|
|
||
| Properties: | ||
| ----------- | ||
| java.version = 11.0.12 | ||
| java.version.major = 11 | ||
| java.version.micro = 12 | ||
| java.version.minor = 0 | ||
| java.version.platform = 11 | ||
| jetty.base = /home/joakim/code/jetty/distros/bases/ssl10 | ||
| jetty.base.uri = file:///home/joakim/code/jetty/distros/bases/ssl10 | ||
| jetty.home = /opt/jetty-home-10.0.7 | ||
| jetty.home.uri = file:///opt/jetty-home-10.0.7 | ||
| jetty.requestlog.dir = logs | ||
| jetty.webapp.addServerClasses = org.eclipse.jetty.logging.,${jetty.home.uri}/lib/logging/,org.slf4j. | ||
| runtime.feature.alpn = true | ||
| slf4j.version = 2.0.0-alpha5 | ||
|
|
||
| Jetty Server Classpath: | ||
| ----------------------- | ||
| Version Information on 9 entries in the classpath. | ||
| Note: order presented here is how they would appear on the classpath. | ||
| changes to the --module=name command line options will be reflected here. | ||
| 0: (dir) | ${jetty.base}/resources | ||
| 1: 2.0.0-alpha5 | ${jetty.home}/lib/logging/slf4j-api-2.0.0-alpha5.jar | ||
| 2: 10.0.7 | ${jetty.home}/lib/logging/jetty-slf4j-impl-10.0.7.jar | ||
| 3: 4.0.6 | ${jetty.home}/lib/jetty-servlet-api-4.0.6.jar | ||
| 4: 10.0.7 | ${jetty.home}/lib/jetty-http-10.0.7.jar | ||
| 5: 10.0.7 | ${jetty.home}/lib/jetty-server-10.0.7.jar | ||
| 6: 10.0.7 | ${jetty.home}/lib/jetty-xml-10.0.7.jar | ||
| 7: 10.0.7 | ${jetty.home}/lib/jetty-util-10.0.7.jar | ||
| 8: 10.0.7 | ${jetty.home}/lib/jetty-io-10.0.7.jar | ||
|
|
||
| Jetty Active XMLs: | ||
| ------------------ | ||
| ${jetty.home}/etc/jetty-bytebufferpool.xml | ||
| ${jetty.home}/etc/jetty-threadpool.xml | ||
| ${jetty.home}/etc/jetty.xml | ||
| ${jetty.home}/etc/jetty-http.xml | ||
| ${jetty.home}/etc/jetty-ssl.xml | ||
| ${jetty.home}/etc/jetty-ssl-context.xml | ||
| ${jetty.home}/etc/jetty-https.xml | ||
| ${jetty.home}/etc/jetty-requestlog.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,36 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| ~ | ||
| ~ ======================================================================== | ||
| ~ Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. | ||
| ~ | ||
| ~ This program and the accompanying materials are made available under the | ||
| ~ terms of the Eclipse Public License v. 2.0 which is available at | ||
| ~ https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| ~ which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| ~ | ||
| ~ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| ~ ======================================================================== | ||
| ~ | ||
| --> | ||
|
|
||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> | ||
| <Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> | ||
| <Call name="addHandler"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.servlet.ServletContextHandler"> | ||
| <Set name="contextPath">/bar</Set> | ||
| <Set name="resourceBase"><Property name="custom.resources" />/bar/ | ||
| </Set> | ||
| <Call name="addServlet"> | ||
| <Arg>org.eclipse.jetty.cookbook.servlets.HelloServlet</Arg> | ||
| <Arg>/hello</Arg> | ||
| </Call> | ||
| <Call name="addServlet"> | ||
| <Arg>org.eclipse.jetty.cookbook.servlets.DumpServlet</Arg> | ||
| <Arg>/dump</Arg> | ||
| </Call> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| ~ | ||
| ~ ======================================================================== | ||
| ~ Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others. | ||
| ~ | ||
| ~ This program and the accompanying materials are made available under the | ||
| ~ terms of the Eclipse Public License v. 2.0 which is available at | ||
| ~ https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| ~ which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| ~ | ||
| ~ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| ~ ======================================================================== | ||
| ~ | ||
| --> | ||
|
|
||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> | ||
| <Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> | ||
| <Call name="addHandler"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.servlet.ServletContextHandler"> | ||
| <Set name="contextPath">/foo</Set> | ||
| <Set name="resourceBase"><Property name="custom.resources" />/foo/ | ||
| </Set> | ||
| <Call name="addServlet"> | ||
| <Arg>org.eclipse.jetty.cookbook.servlets.HelloServlet</Arg> | ||
| <Arg>*.hello</Arg> | ||
| </Call> | ||
| <Call name="addServlet"> | ||
| <Arg>org.eclipse.jetty.cookbook.servlets.DumpServlet</Arg> | ||
| <Arg>*.dump</Arg> | ||
| </Call> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| jetty.http.port=9090 | ||
| jetty.ssl.port=9443 | ||
| jetty.httpConfig.securePort=9443 | ||
| jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 |
Binary file not shown.
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,25 @@ | ||
| This contents of custom.properties was obtained form using jetty-home / jetty-base | ||
|
|
||
| ``` shell | ||
| [tmp]$ mkdir ssl10 | ||
| [ssl10]$ cd ssl10 | ||
| [ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --create-start-ini --add-modules=http,https,requestlog | ||
| INFO : create ${jetty.base}/start.ini | ||
| INFO : server transitively enabled, ini template available with --add-module=server | ||
| INFO : logging-jetty transitively enabled | ||
| INFO : requestlog initialized in ${jetty.base}/start.ini | ||
| INFO : http initialized in ${jetty.base}/start.ini | ||
| INFO : resources transitively enabled | ||
| INFO : https initialized in ${jetty.base}/start.ini | ||
| INFO : threadpool transitively enabled, ini template available with --add-module=threadpool | ||
| INFO : ssl transitively enabled, ini template available with --add-module=ssl | ||
| INFO : logging/slf4j transitive provider of logging/slf4j for logging-jetty | ||
| INFO : logging/slf4j dynamic dependency of logging-jetty | ||
| INFO : bytebufferpool transitively enabled, ini template available with --add-module=bytebufferpool | ||
| INFO : mkdir ${jetty.base}/resources | ||
| INFO : copy ${jetty.home}/modules/logging/jetty/resources/jetty-logging.properties to ${jetty.base}/resources/jetty-logging.properties | ||
| INFO : mkdir ${jetty.base}/logs | ||
| INFO : Base directory was modified | ||
|
|
||
| [ssl10]$ cat start.ini | ||
| ``` |
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,12 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> | ||
| <Configure> | ||
| <New id="byteBufferPool" class="org.eclipse.jetty.io.ArrayByteBufferPool"> | ||
| <Arg type="int"><Property name="jetty.byteBufferPool.minCapacity" default="0"/></Arg> | ||
| <Arg type="int"><Property name="jetty.byteBufferPool.factor" default="1024"/></Arg> | ||
| <Arg type="int"><Property name="jetty.byteBufferPool.maxCapacity" default="65536"/></Arg> | ||
| <Arg type="int"><Property name="jetty.byteBufferPool.maxQueueLength" default="-1"/></Arg> | ||
| <Arg type="long"><Property name="jetty.byteBufferPool.maxHeapMemory" default="-1"/></Arg> | ||
| <Arg type="long"><Property name="jetty.byteBufferPool.maxDirectMemory" default="-1"/></Arg> | ||
| </New> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> | ||
|
|
||
| <!-- ============================================================= --> | ||
| <!-- Configure the Jetty Server instance with an ID "Server" --> | ||
| <!-- by adding an HTTP connector. --> | ||
| <!-- This configuration must be used in conjunction with jetty.xml --> | ||
| <!-- ============================================================= --> | ||
| <Configure id="Server" class="org.eclipse.jetty.server.Server"> | ||
|
|
||
| <!-- =========================================================== --> | ||
| <!-- Add an 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 id="httpConnector" class="org.eclipse.jetty.server.ServerConnector"> | ||
| <Arg name="server"><Ref refid="Server" /></Arg> | ||
| <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" default="1"/></Arg> | ||
| <Arg name="selectors" type="int"><Property name="jetty.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="jetty.http.host" /> | ||
| <Set name="port"><Property name="jetty.http.port" default="8080" /></Set> | ||
| <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set> | ||
| <Set name="acceptorPriorityDelta" property="jetty.http.acceptorPriorityDelta" /> | ||
| <Set name="acceptQueueSize" property="jetty.http.acceptQueueSize" /> | ||
| <Set name="reuseAddress"><Property name="jetty.http.reuseAddress" default="true"/></Set> | ||
| <Set name="reusePort"><Property name="jetty.http.reusePort" default="false"/></Set> | ||
| <Set name="acceptedTcpNoDelay"><Property name="jetty.http.acceptedTcpNoDelay" default="true"/></Set> | ||
| <Set name="acceptedReceiveBufferSize" property="jetty.http.acceptedReceiveBufferSize" /> | ||
| <Set name="acceptedSendBufferSize" property="jetty.http.acceptedSendBufferSize" /> | ||
| <Get name="SelectorManager"> | ||
| <Set name="connectTimeout"><Property name="jetty.http.connectTimeout" default="15000"/></Set> | ||
| </Get> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> | ||
|
|
||
| <!-- ============================================================= --> | ||
| <!-- Configure an HTTPS connector. --> | ||
| <!-- This configuration must be used in conjunction with jetty.xml --> | ||
| <!-- and jetty-ssl.xml. --> | ||
| <!-- ============================================================= --> | ||
| <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> | ||
|
|
||
| <Call name="addIfAbsentConnectionFactory"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.SslConnectionFactory"> | ||
| <Arg name="next">http/1.1</Arg> | ||
| <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg> | ||
| </New> | ||
| </Arg> | ||
| </Call> | ||
|
|
||
| <Call name="addConnectionFactory"> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.HttpConnectionFactory"> | ||
| <Arg name="config"><Ref refid="sslHttpConfig" /></Arg> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd"> | ||
|
|
||
| <!-- =============================================================== --> | ||
| <!-- Configure the Jetty Request Log --> | ||
| <!-- =============================================================== --> | ||
| <Configure id="Server" class="org.eclipse.jetty.server.Server"> | ||
|
|
||
| <!-- =========================================================== --> | ||
| <!-- Configure Request Log for Server --> | ||
| <!-- (Use RequestLogHandler for a context specific RequestLog --> | ||
| <!-- =========================================================== --> | ||
| <Set name="RequestLog"> | ||
| <New id="RequestLog" class="org.eclipse.jetty.server.CustomRequestLog"> | ||
| <!-- Writer --> | ||
| <Arg> | ||
| <New class="org.eclipse.jetty.server.AsyncRequestLogWriter"> | ||
| <Arg> | ||
| <Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration"> | ||
| <Arg><Property name="jetty.base"/></Arg> | ||
| <Arg> | ||
| <Property name="jetty.requestlog.filePath"> | ||
| <Default> | ||
| <Property name="jetty.requestlog.dir" default="logs"/>/yyyy_mm_dd.request.log | ||
| </Default> | ||
| </Property> | ||
| </Arg> | ||
| </Call> | ||
| </Arg> | ||
|
|
||
| <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> | ||
| <Set name="retainDays"><Property name="jetty.requestlog.retainDays" default="90"/></Set> | ||
| <Set name="append"><Property name="jetty.requestlog.append" default="false"/></Set> | ||
| <Set name="timeZone"><Property name="jetty.requestlog.timezone" default="GMT"/></Set> | ||
| </New> | ||
| </Arg> | ||
|
|
||
| <!-- Format String --> | ||
| <Arg> | ||
| <Property name="jetty.requestlog.formatString" deprecated="jetty.customrequestlog.formatString"> | ||
| <Default> | ||
| <Get class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT"/> | ||
| </Default> | ||
| </Property> | ||
| </Arg> | ||
| </New> | ||
| </Set> | ||
| </Configure> |
Oops, something went wrong.