Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release-9.3

This commit is contained in:
Joakim Erdfelt 2015-06-12 09:30:46 -07:00
parent 7d1ba7d0b7 574373b806
commit c6ac82f50b
155 changed files with 66 additions and 888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache-jsp/src/main/config/modules/apache-jsp.mod
View File

@ -2,9 +2,6 @@
# Apache JSP Module # Apache JSP Module
# #
[version]
9.3
[name] [name]
apache-jsp apache-jsp

3
apache-jstl/src/main/config/modules/apache-jstl.mod
View File

@ -2,9 +2,6 @@
# Apache JSTL # Apache JSTL
# #
[version]
9.3
[name] [name]
apache-jstl apache-jstl

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
protonego-boot protonego-boot

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
protonego-boot protonego-boot

13
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
View File

@ -16,9 +16,6 @@
# All versions of alpn-boot can be found at # All versions of alpn-boot can be found at
# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/ # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
[version]
9.3
[name] [name]
alpn alpn
@ -38,15 +35,15 @@ lib/
lib/alpn/ lib/alpn/
[ini-template] [ini-template]
# Overrides the order protocols are chosen by the server. ## Overrides the order protocols are chosen by the server.
# The default order is that specified by the order of the ## The default order is that specified by the order of the
# modules declared in start.ini. ## modules declared in start.ini.
# jetty.alpn.protocols=h2-16,http/1.1 # jetty.alpn.protocols=h2-16,http/1.1
# Specifies what protocol to use when negotiation fails. ## Specifies what protocol to use when negotiation fails.
# jetty.alpn.defaultProtocol=http/1.1 # jetty.alpn.defaultProtocol=http/1.1
# ALPN debug logging on System.err ## ALPN debug logging on System.err
# jetty.alpn.debug=false # jetty.alpn.debug=false
[license] [license]

3
jetty-annotations/src/main/config/modules/annotations.mod
View File

@ -2,9 +2,6 @@
# Jetty Annotation Scanning Module # Jetty Annotation Scanning Module
# #
[version]
9.3
[depend] [depend]
# Annotations needs plus, and jndi features # Annotations needs plus, and jndi features
plus plus

5
jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
View File

@ -1,10 +1,7 @@
# #
# CDI / Weld Jetty module # [EXPERIMENTAL] CDI / Weld Jetty module
# #
[version]
9.3
[depend] [depend]
deploy deploy
annotations annotations

3
jetty-client/src/main/config/modules/client.mod
View File

@ -2,8 +2,5 @@
# Client Feature # Client Feature
# #
[version]
9.3
[lib] [lib]
lib/jetty-client-${jetty.version}.jar lib/jetty-client-${jetty.version}.jar

3
jetty-deploy/src/main/config/modules/deploy.mod
View File

@ -2,9 +2,6 @@
# Deploy Feature # Deploy Feature
# #
[version]
9.3
[depend] [depend]
webapp webapp

5
jetty-distribution/src/main/resources/modules/hawtio.mod
View File

@ -2,9 +2,6 @@
# Hawtio x module # Hawtio x module
# #
[version]
9.3
[depend] [depend]
stats stats
deploy deploy
@ -25,7 +22,7 @@ http://github.com/hawtio/hawtio
http://www.apache.org/licenses/LICENSE-2.0.html http://www.apache.org/licenses/LICENSE-2.0.html
[ini-template] [ini-template]
## Hawt.io configuration
-Dhawtio.authenticationEnabled=false -Dhawtio.authenticationEnabled=false
-Dhawtio.dirname=/dirname -Dhawtio.dirname=/dirname
-Dhawtio.config.dir=${jetty.base}/etc/hawtio -Dhawtio.config.dir=${jetty.base}/etc/hawtio

6
jetty-distribution/src/main/resources/modules/jamon.mod
View File

@ -2,9 +2,6 @@
# JAMon Jetty module # JAMon Jetty module
# #
[version]
9.3
[depend] [depend]
stats stats
deploy deploy
@ -28,6 +25,7 @@ http://jamonapi.sourceforge.net
http://jamonapi.sourceforge.net/JAMonLicense.html http://jamonapi.sourceforge.net/JAMonLicense.html
[ini-template] [ini-template]
jamon.summaryLabels=default, request.getStatus().contextpath.value.ms ## Jamon Configuration
# jamon.summaryLabels=demo # jamon.summaryLabels=demo
jamon.summaryLabels=default, request.getStatus().contextpath.value.ms

5
jetty-distribution/src/main/resources/modules/jminix.mod
View File

@ -2,9 +2,6 @@
# JaMON Jetty module # JaMON Jetty module
# #
[version]
9.3
[depend] [depend]
stats stats
jmx jmx
@ -39,6 +36,6 @@ https://code.google.com/p/jminix/
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
[ini-template] [ini-template]
# Jminix Configuration ## Jminix Configuration
jminix.port=8088 jminix.port=8088

3
jetty-distribution/src/main/resources/modules/jolokia.mod
View File

@ -2,9 +2,6 @@
# Jolokia Jetty module # Jolokia Jetty module
# #
[version]
9.3
[depend] [depend]
stats stats
deploy deploy

3
jetty-distribution/src/main/resources/modules/jsp.mod
View File

@ -2,9 +2,6 @@
# Jetty JSP Module # Jetty JSP Module
# #
[version]
9.3
[depend] [depend]
servlet servlet
annotations annotations

3
jetty-distribution/src/main/resources/modules/jstl.mod
View File

@ -2,9 +2,6 @@
# Jetty JSTL Module # Jetty JSTL Module
# #
[version]
9.3
[depend] [depend]
jsp jsp
apache-jstl apache-jstl

3
jetty-distribution/src/main/resources/modules/setuid.mod
View File

@ -2,9 +2,6 @@
# Set UID Feature # Set UID Feature
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
View File

@ -2,9 +2,6 @@
# FastCGI Module # FastCGI Module
# #
[version]
9.3
[depend] [depend]
servlet servlet
client client

3
jetty-http2/http2-server/src/main/config/modules/http2.mod
View File

@ -2,9 +2,6 @@
# HTTP2 Support Module # HTTP2 Support Module
# #
[version]
9.3
[depend] [depend]
ssl ssl
alpn alpn

3
jetty-http2/http2-server/src/main/config/modules/http2c.mod
View File

@ -5,9 +5,6 @@
# The resulting connector will accept both HTTP/1 and HTTP/2 connections. # The resulting connector will accept both HTTP/1 and HTTP/2 connections.
# #
[version]
9.3
[depend] [depend]
http http

7
jetty-infinispan/src/main/config/modules/infinispan.mod
View File

@ -2,14 +2,10 @@
# Jetty Infinispan module # Jetty Infinispan module
# #
[version]
9.3
[depend] [depend]
annotations annotations
webapp webapp
[files] [files]
maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar
maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar
@ -21,7 +17,6 @@ maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3.
lib/jetty-infinispan-${jetty.version}.jar lib/jetty-infinispan-${jetty.version}.jar
lib/infinispan/*.jar lib/infinispan/*.jar
[xml] [xml]
etc/jetty-infinispan.xml etc/jetty-infinispan.xml
@ -34,5 +29,5 @@ http://www.apache.org/licenses/LICENSE-2.0.html
## Infinispan Session config ## Infinispan Session config
## Unique identifier for this node in the cluster ## Unique identifier for this node in the cluster
jetty.infinispanSession.workerName=node1 # jetty.infinispanSession.workerName=node1

3
jetty-jaas/src/main/config/modules/jaas.mod
View File

@ -2,9 +2,6 @@
# JAAS Module # JAAS Module
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-jaspi/src/main/config/modules/jaspi.mod
View File

@ -2,9 +2,6 @@
# Jetty JASPI Module # Jetty JASPI Module
# #
[version]
9.3
[depend] [depend]
security security

3
jetty-jmx/src/main/config/modules/jmx-remote.mod
View File

@ -2,9 +2,6 @@
# JMX Remote Module # JMX Remote Module
# #
[version]
9.3
[depend] [depend]
jmx jmx

3
jetty-jmx/src/main/config/modules/jmx.mod
View File

@ -2,9 +2,6 @@
# JMX Module # JMX Module
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-jndi/src/main/config/modules/jndi.mod
View File

@ -2,9 +2,6 @@
# JNDI Support # JNDI Support
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-monitor/src/main/config/modules/monitor.mod
View File

@ -2,9 +2,6 @@
# Jetty Monitor module # Jetty Monitor module
# #
[version]
9.3
[depend] [depend]
server server
client client

8
jetty-nosql/src/main/config/modules/nosql.mod
View File

@ -2,9 +2,6 @@
# Jetty NoSql module # Jetty NoSql module
# #
[version]
9.3
[depend] [depend]
webapp webapp
@ -27,9 +24,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html
## MongoDB SessionIdManager config ## MongoDB SessionIdManager config
## Unique identifier for this node in the cluster ## Unique identifier for this node in the cluster
jetty.nosqlSession.workerName=node1 # jetty.nosqlSession.workerName=node1
## Interval in seconds between scavenging expired sessions ## Interval in seconds between scavenging expired sessions
jetty.nosqlSession.scavenge=1800 # jetty.nosqlSession.scavenge=1800

3
jetty-overlay-deployer/src/main/config/modules/overlay.mod
View File

@ -2,9 +2,6 @@
# Jetty Overlay module # Jetty Overlay module
# #
[version]
9.3
[depend] [depend]
deploy deploy

3
jetty-plus/src/main/config/modules/plus.mod
View File

@ -2,9 +2,6 @@
# Jetty Plus module # Jetty Plus module
# #
[version]
9.3
[depend] [depend]
server server
security security

3
jetty-proxy/src/main/config/modules/proxy.mod
View File

@ -2,9 +2,6 @@
# Jetty Proxy module # Jetty Proxy module
# #
[version]
9.3
[depend] [depend]
servlet servlet
client client

4
jetty-quickstart/src/main/config/modules/quickstart.mod
View File

@ -2,14 +2,10 @@
# Jetty Quickstart module # Jetty Quickstart module
# #
[version]
9.3
[depend] [depend]
server server
plus plus
annotations annotations
[lib] [lib]
lib/jetty-quickstart-${jetty.version}.jar lib/jetty-quickstart-${jetty.version}.jar

2
jetty-rewrite/src/main/config/modules/rewrite.mod
View File

@ -1,8 +1,6 @@
# #
# Jetty Rewrite module # Jetty Rewrite module
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-security/src/main/config/modules/security.mod
View File

@ -2,9 +2,6 @@
# Jetty Security Module # Jetty Security Module
# #
[version]
9.3
[depend] [depend]
server server

2
jetty-server/src/main/config/etc/jetty-ssl.xml
View File

@ -27,7 +27,7 @@
</Arg> </Arg>
<Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set> <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
<Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="443" /></Set> <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="8443" /></Set>
<Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set> <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
<Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set> <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set> <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>

3
jetty-server/src/main/config/modules/continuation.mod
View File

@ -2,8 +2,5 @@
# Classic Jetty Continuation Support Module # Classic Jetty Continuation Support Module
# #
[version]
9.3
[lib] [lib]
lib/jetty-continuation-${jetty.version}.jar lib/jetty-continuation-${jetty.version}.jar

3
jetty-server/src/main/config/modules/debuglog.mod
View File

@ -2,9 +2,6 @@
# Debug module # Debug module
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-server/src/main/config/modules/ext.mod
View File

@ -2,9 +2,6 @@
# Module to add all lib/ext/**.jar files to classpath # Module to add all lib/ext/**.jar files to classpath
# #
[version]
9.3
[lib] [lib]
lib/ext/**.jar lib/ext/**.jar

3
jetty-server/src/main/config/modules/gzip.mod
View File

@ -3,9 +3,6 @@
# Applies GzipHandler to entire server # Applies GzipHandler to entire server
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-server/src/main/config/modules/home-base-warning.mod
View File

@ -2,9 +2,6 @@
# Home and Base Warning # Home and Base Warning
# #
[version]
9.3
[xml] [xml]
etc/home-base-warning.xml etc/home-base-warning.xml

3
jetty-server/src/main/config/modules/http.mod
View File

@ -2,9 +2,6 @@
# Jetty HTTP Connector # Jetty HTTP Connector
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-server/src/main/config/modules/https.mod
View File

@ -2,9 +2,6 @@
# Jetty HTTPS Connector # Jetty HTTPS Connector
# #
[version]
9.3
[depend] [depend]
ssl ssl

3
jetty-server/src/main/config/modules/ipaccess.mod
View File

@ -2,9 +2,6 @@
# IPAccess module # IPAccess module
# #
[version]
9.3
[depend] [depend]
server server

7
jetty-server/src/main/config/modules/jdbc-sessions.mod
View File

@ -2,9 +2,6 @@
# Jetty JDBC Session module # Jetty JDBC Session module
# #
[version]
9.3
[depend] [depend]
annotations annotations
webapp webapp
@ -17,10 +14,10 @@ etc/jetty-jdbc-sessions.xml
## JDBC Session config ## JDBC Session config
## Unique identifier for this node in the cluster ## Unique identifier for this node in the cluster
jetty.jdbcSession.workerName=node1 # jetty.jdbcSession.workerName=node1
## The interval in seconds between sweeps of the scavenger ## The interval in seconds between sweeps of the scavenger
jetty.jdbcSession.scavenge=600 # jetty.jdbcSession.scavenge=600
## Uncomment either the datasource name or driverClass and connectionURL ## Uncomment either the datasource name or driverClass and connectionURL
# jetty.jdbcSession.datasource=sessions # jetty.jdbcSession.datasource=sessions

3
jetty-server/src/main/config/modules/jvm.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[ini-template] [ini-template]
## JVM Configuration ## JVM Configuration
## If JVM args are include in an ini file then --exec is needed ## If JVM args are include in an ini file then --exec is needed

3
jetty-server/src/main/config/modules/lowresources.mod
View File

@ -2,9 +2,6 @@
# Low Resources module # Low Resources module
# #
[version]
9.3
[depend] [depend]
server server

11
jetty-server/src/main/config/modules/requestlog.mod
View File

@ -2,9 +2,6 @@
# Request Log module # Request Log module
# #
[version]
9.3
[depend] [depend]
server server
@ -21,19 +18,19 @@ logs/
## File path ## File path
# jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log # jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
# Date format for rollovered files (uses SimpleDateFormat syntax) ## Date format for rollovered files (uses SimpleDateFormat syntax)
# jetty.requestlog.filenameDateFormat=yyyy_MM_dd # jetty.requestlog.filenameDateFormat=yyyy_MM_dd
# How many days to retain old log files ## How many days to retain old log files
# jetty.requestlog.retainDays=90 # jetty.requestlog.retainDays=90
## Whether to append to existing file ## Whether to append to existing file
# jetty.requestlog.append=true # jetty.requestlog.append=true
# Whether to use the extended log output ## Whether to use the extended log output
# jetty.requestlog.extended=true # jetty.requestlog.extended=true
# Whether to log http cookie information ## Whether to log http cookie information
# jetty.requestlog.cookies=true # jetty.requestlog.cookies=true
## Timezone of the log entries ## Timezone of the log entries

3
jetty-server/src/main/config/modules/resources.mod
View File

@ -2,9 +2,6 @@
# Module to add resources directory to classpath # Module to add resources directory to classpath
# #
[version]
9.3
[lib] [lib]
resources/ resources/

3
jetty-server/src/main/config/modules/server.mod
View File

@ -2,9 +2,6 @@
# Base Server Module # Base Server Module
# #
[version]
9.3
[optional] [optional]
jvm jvm
ext ext

4
jetty-server/src/main/config/modules/ssl.mod
View File

@ -1,8 +1,6 @@
# #
# SSL Keystore module # SSL Keystore module
# #
[version]
9.3
[name] [name]
ssl ssl
@ -24,7 +22,7 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/
# jetty.ssl.host=0.0.0.0 # jetty.ssl.host=0.0.0.0
## Connector port to listen on ## Connector port to listen on
jetty.ssl.port=8443 # jetty.ssl.port=8443
## Connector idle timeout in milliseconds ## Connector idle timeout in milliseconds
# jetty.ssl.idleTimeout=30000 # jetty.ssl.idleTimeout=30000

3
jetty-server/src/main/config/modules/stats.mod
View File

@ -2,9 +2,6 @@
# Stats module # Stats module
# #
[version]
9.3
[depend] [depend]
server server

3
jetty-servlet/src/main/config/modules/servlet.mod
View File

@ -2,9 +2,6 @@
# Jetty Servlet Module # Jetty Servlet Module
# #
[version]
9.3
[depend] [depend]
server server

2
jetty-servlets/src/main/config/modules/servlets.mod
View File

@ -2,8 +2,6 @@
# Jetty Servlets Module # Jetty Servlets Module
# #
[version]
9.3
[depend] [depend]
servlet servlet

2
jetty-spring/src/main/config/modules/spring.mod
View File

@ -1,8 +1,6 @@
# #
# Spring # Spring
# #
[version]
9.3
[name] [name]
spring spring

17
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -1081,10 +1081,6 @@ public class StartArgs
} }
public void parseModule(Module module) public void parseModule(Module module)
{
// Starting with Jetty 9.3 indicated modules, the default config
// is parsed from the [default] section only
if (module.getVersion().isNewerThanOrEqualTo(new Version("9.3")))
{ {
if (module.hasDefaultConfig()) if (module.hasDefaultConfig())
{ {
@ -1094,19 +1090,6 @@ public class StartArgs
} }
} }
} }
else
{
// With Jetty 9.2 indicated modules and older, the default
// config is parsed from the [ini-template] section
if (module.hasIniTemplate())
{
for (String line : module.getIniTemplate())
{
parse(line,module.getFilesystemRef(),false);
}
}
}
}
public void resolveExtraXmls(BaseHome baseHome) throws IOException public void resolveExtraXmls(BaseHome baseHome) throws IOException
{ {

2
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
View File

@ -159,7 +159,7 @@ public class MainTest
Path homePath = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath(); Path homePath = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath();
cmdLineArgs.add("jetty.home=" + homePath); cmdLineArgs.add("jetty.home=" + homePath);
cmdLineArgs.add("user.dir=" + homePath); cmdLineArgs.add("user.dir=" + homePath);
cmdLineArgs.add("java.version=1.7.0_60"); cmdLineArgs.add("java.version=1.8.0_31");
// Modules // Modules
cmdLineArgs.add("--module=deploy"); cmdLineArgs.add("--module=deploy");

2
jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
View File

@ -50,7 +50,7 @@ public class TestUseCases
ret.add(new String[] {"versioned-modules", null}); ret.add(new String[] {"versioned-modules", null});
// Ones with command lines // Ones with command lines
ret.add(new Object[] {"http2", new String[]{"java.version=1.7.0_60"}}); ret.add(new Object[] {"http2", new String[]{"java.version=1.8.0_31"}});
ret.add(new Object[] {"basic-properties", new String[]{"port=9090"}}); ret.add(new Object[] {"basic-properties", new String[]{"port=9090"}});
ret.add(new Object[] {"agent-properties", new String[]{"java.vm.specification.version=1.6"}}); ret.add(new Object[] {"agent-properties", new String[]{"java.vm.specification.version=1.6"}});

4
jetty-start/src/test/resources/assert-home-with-http2.txt
View File

@ -53,7 +53,7 @@ LIB|${jetty.base}/lib/jetty-jndi-9.3.jar
# The Properties we expect (order is irrelevant) # The Properties we expect (order is irrelevant)
# (these are the properties we actually set in the configuration) # (these are the properties we actually set in the configuration)
PROP|java.version=1.7.0_60 PROP|java.version=1.8.0_31
PROP|jetty.http.port=8080 PROP|jetty.http.port=8080
PROP|jetty.httpConfig.delayDispatchUntilContent=false PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.server.dumpAfterStart=false PROP|jetty.server.dumpAfterStart=false
@ -72,7 +72,7 @@ JVM|-Xms1024m
JVM|-Xmx1024m JVM|-Xmx1024m
# Downloads # Downloads
DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore
# Files # Files

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
alpn-boot
[files]
maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

11
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod
View File

@ -1,11 +0,0 @@
[version]
9.3
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
alpn-boot alpn-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
protonego-boot protonego-boot

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod
View File

@ -1,6 +1,3 @@
[version]
9.3
[name] [name]
protonego-boot protonego-boot

13
jetty-start/src/test/resources/dist-home/modules/alpn.mod
View File

@ -16,9 +16,6 @@
# All versions of alpn-boot can be found at # All versions of alpn-boot can be found at
# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/ # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
[version]
9.3
[name] [name]
alpn alpn
@ -38,15 +35,15 @@ lib/
lib/alpn/ lib/alpn/
[ini-template] [ini-template]
# Overrides the order protocols are chosen by the server. ## Overrides the order protocols are chosen by the server.
# The default order is that specified by the order of the ## The default order is that specified by the order of the
# modules declared in start.ini. ## modules declared in start.ini.
# jetty.alpn.protocols=h2-16,http/1.1 # jetty.alpn.protocols=h2-16,http/1.1
# Specifies what protocol to use when negotiation fails. ## Specifies what protocol to use when negotiation fails.
# jetty.alpn.defaultProtocol=http/1.1 # jetty.alpn.defaultProtocol=http/1.1
# ALPN debug logging on System.err ## ALPN debug logging on System.err
# jetty.alpn.debug=false # jetty.alpn.debug=false
[license] [license]

3
jetty-start/src/test/resources/dist-home/modules/annotations.mod
View File

@ -2,9 +2,6 @@
# Jetty Annotation Scanning Module # Jetty Annotation Scanning Module
# #
[version]
9.3
[depend] [depend]
# Annotations needs plus, and jndi features # Annotations needs plus, and jndi features
plus plus

3
jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod
View File

@ -2,9 +2,6 @@
# Apache JSP Module # Apache JSP Module
# #
[version]
9.3
[name] [name]
apache-jsp apache-jsp

Some files were not shown because too many files have changed in this diff Show More