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

460671 - Rationalize property names. 

Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
This commit is contained in:
Simone Bordet 2015-04-13 16:21:48 +02:00
parent d78673f8f8
commit 599ab9bb1b
138 changed files with 1189 additions and 1034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
View File

@ -28,7 +28,7 @@ public class DemoServer
{ {
String jetty_home = System.getProperty("jetty.home","."); String jetty_home = System.getProperty("jetty.home",".");
Server server = new Server(Integer.getInteger("jetty.port",8080).intValue()); Server server = new Server(Integer.getInteger("jetty.http.port",8080).intValue());
WebAppContext webapp = new WebAppContext(); WebAppContext webapp = new WebAppContext();
webapp.setContextPath("/"); webapp.setContextPath("/");

8
jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
View File

@ -16,17 +16,17 @@
<Arg> <Arg>
<New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory"> <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
<Arg type="String"> <Arg type="String">
<Property name="alpn.protocols" default="" /> <Property name="jetty.alpn.protocols,alpn.protocols" default="" />
</Arg> </Arg>
<Set name="defaultProtocol"> <Set name="defaultProtocol">
<Property name="alpn.defaultProtocol" /> <Property name="jetty.alpn.defaultProtocol,alpn.defaultProtocol" />
</Set> </Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
<!-- Enables ALPN debugging on System.err --> <!-- ALPN debugging on System.err -->
<!--<Set class="org.eclipse.jetty.alpn.ALPN" name="debug" type="boolean">true</Set>--> <Set class="org.eclipse.jetty.alpn.ALPN" name="debug" type="boolean"><Property name="jetty.alpn.debug" default="false" /></Set>
</Configure> </Configure>

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

@ -38,10 +38,13 @@ lib/alpn/
# 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.
# alpn.protocols=h2-14,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.
# alpn.defaultProtocol=http/1.1 # jetty.alpn.defaultProtocol=http/1.1
# ALPN debug logging on System.err
# jetty.alpn.debug=false
[license] [license]
ALPN is a hosted at github under the GPL v2 with ClassPath Exception. ALPN is a hosted at github under the GPL v2 with ClassPath Exception.

2
jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh
View File

@ -11,7 +11,7 @@ echo \${jetty.base} : $JETTY_BASE
cd "$JETTY_BASE" cd "$JETTY_BASE"
"$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ "$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \
jetty.port=58080 \ jetty.http.port=58080 \
STOP.PORT=58181 STOP.KEY=it STOP.PORT=58181 STOP.KEY=it

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

@ -39,7 +39,7 @@
<Call id="webappprovider" name="addAppProvider"> <Call id="webappprovider" name="addAppProvider">
<Arg> <Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDirName" default="webapps"/></Set> <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir,jetty.deploy.monitoredDirName" default="webapps"/></Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set>
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set> <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set> <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>

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

@ -15,7 +15,11 @@ webapps/
etc/jetty-deploy.xml etc/jetty-deploy.xml
[ini-template] [ini-template]
## DeployManager configuration # Monitored directory name (relative to jetty.base)
# Monitored Directory name (relative to jetty.base) # jetty.deploy.monitoredDir=webapps
# jetty.deploy.monitoredDirName=webapps
# Monitored directory scan period (seconds)
# jetty.deploy.scanInterval=1
# Whether to extract *.war files
# jetty.deploy.extractWars=true

12
jetty-deploy/src/test/resources/jetty.xml
View File

@ -46,9 +46,9 @@
<Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg> <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
--> -->
<Get name="ThreadPool"> <Get name="ThreadPool">
<Set name="minThreads" type="int"><Property name="threads.min" default="10"/></Set> <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" default="10"/></Set>
<Set name="maxThreads" type="int"><Property name="threads.max" default="200"/></Set> <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" default="200"/></Set>
<Set name="idleTimeout" type="int"><Property name="threads.timeout" default="60000"/></Set> <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" default="60000"/></Set>
<Set name="detailedDump">false</Set> <Set name="detailedDump">false</Set>
</Get> </Get>
@ -78,7 +78,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Set name="secureScheme">https</Set> <Set name="secureScheme">https</Set>
<Set name="securePort" type="java.lang.Integer"><Property name="jetty.secure.port" default="8443" /></Set> <Set name="securePort" type="java.lang.Integer"><Property name="jetty.httpConfig.securePort" default="8443" /></Set>
<Set name="outputBufferSize">32768</Set> <Set name="outputBufferSize">32768</Set>
<Set name="requestHeaderSize">8192</Set> <Set name="requestHeaderSize">8192</Set>
<Set name="responseHeaderSize">8192</Set> <Set name="responseHeaderSize">8192</Set>
@ -125,7 +125,7 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<Set name="stopAtShutdown">true</Set> <Set name="stopAtShutdown">true</Set>
<Set name="stopTimeout">5000</Set> <Set name="stopTimeout">5000</Set>
<Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set> <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" default="false"/></Set>
<Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set> <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" default="false"/></Set>
</Configure> </Configure>

2
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -69,7 +69,7 @@ NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]*//' -e 's/\.sh$//')
# JETTY_ARGS # JETTY_ARGS
# The default arguments to pass to jetty. # The default arguments to pass to jetty.
# For example # For example
# JETTY_ARGS=jetty.port=8080 jetty.secure.port=443 # JETTY_ARGS=jetty.http.port=8080 jetty.ssl.port=8443
# #
# JETTY_USER # JETTY_USER
# if set, then used as a username to run the server as # if set, then used as a username to run the server as

10
jetty-distribution/src/main/resources/etc/hawtio.xml
View File

@ -5,11 +5,11 @@
<Call name="addHandler"> <Call name="addHandler">
<Arg> <Arg>
<New class="org.eclipse.jetty.webapp.WebAppContext"> <New class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/hawtio</Set> <Set name="contextPath">/hawtio</Set>
<Set name="war"><Property name="jetty.base" default="."/>/lib/hawtio/hawtio.war</Set> <Set name="war"><Property name="jetty.base" default="."/>/lib/hawtio/hawtio.war</Set>
<Set name="extractWAR">true</Set> <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set> <Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

14
jetty-distribution/src/main/resources/etc/jamon.xml
View File

@ -18,13 +18,13 @@
<Ref refid="Contexts"> <Ref refid="Contexts">
<Call name="addHandler"> <Call name="addHandler">
<Arg> <Arg>
<New class="org.eclipse.jetty.webapp.WebAppContext"> <New class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/jamon</Set> <Set name="contextPath">/jamon</Set>
<Set name="war"><Property name="jetty.base" default="."/>/lib/jamon/jamon.war</Set> <Set name="war"><Property name="jetty.base" default="."/>/lib/jamon/jamon.war</Set>
<Set name="extractWAR">true</Set> <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set> <Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
</Ref> </Ref>

2
jetty-distribution/src/main/resources/etc/jminix.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">

10
jetty-distribution/src/main/resources/etc/jolokia.xml
View File

@ -5,11 +5,11 @@
<Call name="addHandler"> <Call name="addHandler">
<Arg> <Arg>
<New class="org.eclipse.jetty.webapp.WebAppContext"> <New class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/jolokia</Set> <Set name="contextPath">/jolokia</Set>
<Set name="war"><Property name="jetty.base" default="."/>/lib/jolokia/jolokia.war</Set> <Set name="war"><Property name="jetty.base" default="."/>/lib/jolokia/jolokia.war</Set>
<Set name="extractWAR">true</Set> <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set> <Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

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

@ -12,4 +12,4 @@ lib/fcgi/*.jar
[ini-template] [ini-template]
## For configuration of FastCGI contexts, see ## For configuration of FastCGI contexts, see
## TODO: documentation url here ## https://www.eclipse.org/jetty/documentation/current/fastcgi.html

3
jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml
View File

@ -9,7 +9,8 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory"> <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig"/></Arg> <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams,http2.maxConcurrentStreams" default="1024"/></Set>
<Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

3
jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml
View File

@ -9,7 +9,8 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory"> <New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory">
<Arg name="config"><Ref refid="httpConfig"/></Arg> <Arg name="config"><Ref refid="httpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams,http2.maxConcurrentStreams" default="1024"/></Set>
<Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

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

@ -13,6 +13,8 @@ lib/http2/*.jar
etc/jetty-http2.xml etc/jetty-http2.xml
[ini-template] [ini-template]
## HTTP2 Configuration ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024
# http2.maxConcurrentStreams=1024 ## Initial stream send (server to client) window
# jetty.http2.initialStreamSendWindow=65535

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

@ -1,5 +1,8 @@
# #
# HTTP2 Clear Text Support Module # HTTP2 Clear Text Support Module
# This module adds support for HTTP/2 clear text to the
# HTTP/1 clear text connector (defined in jetty-http.xml).
# The resulting connector will accept both HTTP/1 and HTTP/2 connections.
# #
[depend] [depend]
@ -12,11 +15,8 @@ lib/http2/*.jar
etc/jetty-http2c.xml etc/jetty-http2c.xml
[ini-template] [ini-template]
## HTTP2c Configuration ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024
# This module adds support for HTTP/2 clear text to the ## Initial stream send (server to client) window
# HTTP/1 clear text connector (defined in jetty-http.xml) # jetty.http2.initialStreamSendWindow=65535
# The resulting connector will accept both HTTP/1 and HTTP/2
# connections
# http2.maxConcurrentStreams=1024

15
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View File

@ -28,7 +28,6 @@ import java.nio.channels.SocketChannel;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.annotation.ManagedAttribute;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.component.Dumpable; import org.eclipse.jetty.util.component.Dumpable;
@ -97,7 +96,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
_connectTimeout = milliseconds; _connectTimeout = milliseconds;
} }
@ManagedAttribute("The priority delta to apply to selector threads") /**
* @deprecated not implemented
*/
@Deprecated @Deprecated
public int getSelectorPriorityDelta() public int getSelectorPriorityDelta()
{ {
@ -105,15 +106,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
} }
/** /**
* Sets the selector thread priority delta to the given amount. * @deprecated not implemented
* <p>This allows the selector threads to run at a different priority.
* Typically this would be used to lower the priority to give preference
* to handling previously accepted connections rather than accepting
* new connections.</p>
*
* @param selectorPriorityDelta the amount to change the thread priority
* delta to (may be negative)
* @see Thread#getPriority()
*/ */
@Deprecated @Deprecated
public void setSelectorPriorityDelta(int selectorPriorityDelta) public void setSelectorPriorityDelta(int selectorPriorityDelta)

3
jetty-jaas/src/main/config/etc/jetty-jaas.xml
View File

@ -3,7 +3,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ======================================================== --> <!-- ======================================================== -->
<!-- java.security.auth.login.config System property --> <!-- java.security.auth.login.config System property -->
<!-- This is usually a runtime parameter to the jvm, but --> <!-- This is usually a runtime parameter to the jvm, but -->
@ -11,7 +10,7 @@
<!-- ======================================================== --> <!-- ======================================================== -->
<Call class="java.lang.System" name="setProperty"> <Call class="java.lang.System" name="setProperty">
<Arg>java.security.auth.login.config</Arg> <Arg>java.security.auth.login.config</Arg>
<Arg><Property name="jetty.base" default="." />/<Property name="jaas.login.conf" default="etc/login.conf"/></Arg> <Arg><Property name="jetty.base" default="." />/<Property name="jetty.jaas.login.conf,jaas.login.conf" default="etc/login.conf"/></Arg>
</Call> </Call>
</Configure> </Configure>

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

@ -12,5 +12,6 @@ lib/jetty-jaas-${jetty.version}.jar
etc/jetty-jaas.xml etc/jetty-jaas.xml
[ini-template] [ini-template]
## JAAS Configuration ## The file location (relative to $jetty.base) for the
jaas.login.conf=etc/login.conf ## JAAS "java.security.auth.login.config" system property
# jetty.jaas.login.conf=etc/login.conf

43
jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
View File

@ -2,27 +2,38 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Set the java.rmi.server.hostname property in case you've -->
<!-- got a misconfigured /etc/hosts entry or the like. -->
<!-- =========================================================== -->
<!--
<Call class="java.lang.System" name="setProperty">
<Arg>java.rmi.server.hostname</Arg>
<Arg>127.0.0.1</Arg>
</Call>
-->
<!-- Add a remote JMX connector. The parameters of the constructor <!-- Add a remote JMX connector. The parameters of the constructor
below specify the JMX service URL, and the object name string for the below specify the JMX service URL, and the object name string for the
connector server bean. The parameters of the JMXServiceURL constructor connector server bean. The parameters of the JMXServiceURL constructor
specify the protocol that clients will use to connect to the remote JMX specify the protocol that clients will use to connect to the remote JMX
connector (RMI), the hostname of the server (local hostname), port number connector (RMI), the hostname of the server (local hostname), port number
(automatically assigned), and the URL path. Note that URL path contains (automatically assigned), and the URL path. Note that URL path contains
the RMI registry hostname and port number, that may need to be modified the RMI registry hostname and port number, that may need to be modified
in order to comply with the firewall requirements. in order to comply with the firewall requirements.
--> -->
<Call name="addBean"> <Call name="addBean">
<Arg> <Arg>
<New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer"> <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
<Arg> <Arg>
<New class="javax.management.remote.JMXServiceURL"> <New class="javax.management.remote.JMXServiceURL">
<Arg type="java.lang.String">rmi</Arg> <Arg type="java.lang.String">rmi</Arg>
<Arg type="java.lang.String" /> <Arg type="java.lang.String"><Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/></Arg>
<Arg type="java.lang.Integer"><Property name="jetty.jmxrmiport" default="1099"/></Arg> <Arg type="java.lang.Integer"><Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/></Arg>
<Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg> <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
</New> </New>
</Arg> </Arg>
<Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg> <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>

11
jetty-jmx/src/main/config/etc/jetty-jmx.xml
View File

@ -3,17 +3,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Set the java.rmi.server.hostname property in case you've -->
<!-- got a misconfigured /etc/hosts entry or the like. -->
<!-- =========================================================== -->
<!--
<Call class="java.lang.System" name="setProperty">
<Arg>java.rmi.server.hostname</Arg>
<Arg>127.0.0.1</Arg>
</Call>
-->
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Get the platform mbean server --> <!-- Get the platform mbean server -->
<!-- =========================================================== --> <!-- =========================================================== -->

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

@ -9,10 +9,8 @@ jmx
etc/jetty-jmx-remote.xml etc/jetty-jmx-remote.xml
[ini-template] [ini-template]
## JMX Configuration ## The host/address to bind RMI to
## Enable for an open port accessible by remote machines # jetty.jmxremote.rmihost=localhost
# jetty.jmxrmihost=localhost
# jetty.jmxrmiport=1099 ## The port RMI listens to
## Strictly speaking you shouldn't need --exec to use this in most environments. # jetty.jmxremote.rmiport=1099
## If this isn't working, make sure you enable --exec as well
# -Dcom.sun.management.jmxremote

5
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
View File

@ -40,7 +40,6 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.security.LoginService;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.RequestLog;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ShutdownMonitor; import org.eclipse.jetty.server.ShutdownMonitor;
@ -491,8 +490,8 @@ public abstract class AbstractJettyMojo extends AbstractMojo
// check that its port was set // check that its port was set
if (httpConnector.getPort() <= 0) if (httpConnector.getPort() <= 0)
{ {
//use any jetty.port settings provided //use any jetty.http.port settings provided
String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, MavenServerConnector.DEFAULT_PORT_STR); String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, System.getProperty("jetty.port", MavenServerConnector.DEFAULT_PORT_STR));
httpConnector.setPort(Integer.parseInt(tmp.trim())); httpConnector.setPort(Integer.parseInt(tmp.trim()));
} }
httpConnector.setServer(server); httpConnector.setServer(server);

12
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java
View File

@ -45,7 +45,6 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.quickstart.QuickStartDescriptorGenerator;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
@ -82,17 +81,6 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
*/ */
public class JettyRunForkedMojo extends JettyRunMojo public class JettyRunForkedMojo extends JettyRunMojo
{ {
public static final String DEFAULT_WEBAPP_SRC = "src"+File.separator+"main"+File.separator+"webapp";
public static final String FAKE_WEBAPP = "webapp-tmp";
public String PORT_SYSPROPERTY = "jetty.port";
/** /**
* The target directory * The target directory
* *

2
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java
View File

@ -47,7 +47,7 @@ import org.eclipse.jetty.util.thread.Scheduler;
*/ */
public class MavenServerConnector extends AbstractLifeCycle implements Connector public class MavenServerConnector extends AbstractLifeCycle implements Connector
{ {
public static String PORT_SYSPROPERTY = "jetty.port"; public static String PORT_SYSPROPERTY = "jetty.http.port";
public static final int DEFAULT_PORT = 8080; public static final int DEFAULT_PORT = 8080;
public static final String DEFAULT_PORT_STR = String.valueOf(DEFAULT_PORT); public static final String DEFAULT_PORT_STR = String.valueOf(DEFAULT_PORT);

4
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerSupport.java
View File

@ -110,8 +110,8 @@ public class ServerSupport
{ {
//Make a new default connector //Make a new default connector
MavenServerConnector tmp = new MavenServerConnector(); MavenServerConnector tmp = new MavenServerConnector();
//use any jetty.port settings provided //use any jetty.http.port settings provided
String port = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, MavenServerConnector.DEFAULT_PORT_STR); String port = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, System.getProperty("jetty.port", MavenServerConnector.DEFAULT_PORT_STR));
tmp.setPort(Integer.parseInt(port.trim())); tmp.setPort(Integer.parseInt(port.trim()));
tmp.setServer(server); tmp.setServer(server);
server.setConnectors(new Connector[] {tmp}); server.setConnectors(new Connector[] {tmp});

2
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java
View File

@ -31,7 +31,6 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ShutdownMonitor; import org.eclipse.jetty.server.ShutdownMonitor;
@ -52,7 +51,6 @@ import org.eclipse.jetty.xml.XmlConfiguration;
*/ */
public class Starter public class Starter
{ {
public static final String PORT_SYSPROPERTY = "jetty.port";
private static final Logger LOG = Log.getLogger(Starter.class); private static final Logger LOG = Log.getLogger(Starter.class);
private List<File> jettyXmls; // list of jetty.xml config files to apply - Mandatory private List<File> jettyXmls; // list of jetty.xml config files to apply - Mandatory

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

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Create Thread Monitor, and add to the Server as a lifecycle --> <!-- Create Thread Monitor, and add to the Server as a lifecycle -->

4
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml
View File

@ -21,8 +21,8 @@
</Item> </Item>
</Array> </Array>
</Arg> </Arg>
<Set name="host"><Property name="jetty.host" /></Set> <Set name="host"><Property name="jetty.http.host" /></Set>
<Set name="port"><Property name="jetty.port" default="8080"/></Set> <Set name="port"><Property name="jetty.http.port" default="8080"/></Set>
<Set name="idleTimeout">300000</Set> <Set name="idleTimeout">300000</Set>
</New> </New>
</Arg> </Arg>

2
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
View File

@ -43,7 +43,7 @@
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Set name="secureScheme">https</Set> <Set name="secureScheme">https</Set>
<Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set> <Set name="securePort"><Property name="jetty.httpConfig.securePort" default="8443" /></Set>
<Set name="outputBufferSize">32768</Set> <Set name="outputBufferSize">32768</Set>
<Set name="requestHeaderSize">8192</Set> <Set name="requestHeaderSize">8192</Set>
<Set name="responseHeaderSize">8192</Set> <Set name="responseHeaderSize">8192</Set>

8
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java
View File

@ -43,20 +43,19 @@ public class OSGiServerConstants
* Usual system property used as the hostname for a typical jetty * Usual system property used as the hostname for a typical jetty
* configuration. * configuration.
*/ */
public static final String JETTY_HOST = "jetty.host"; public static final String JETTY_HOST = "jetty.http.host";
/** /**
* Usual system property used as the port for http for a typical jetty * Usual system property used as the port for http for a typical jetty
* configuration. * configuration.
*/ */
public static final String JETTY_PORT = "jetty.port"; public static final String JETTY_PORT = "jetty.http.port";
/** /**
* Usual system property used as the port for https for a typical jetty * Usual system property used as the port for https for a typical jetty
* configuration. * configuration.
*/ */
public static final String JETTY_PORT_SSL = "ssl.port"; public static final String JETTY_PORT_SSL = "jetty.ssl.port";
//for managed jetty instances, name of the configuration parameters //for managed jetty instances, name of the configuration parameters
/** /**
@ -86,5 +85,4 @@ public class OSGiServerConstants
* List of URLs to the folders where the legacy J2EE shared libraries are stored aka lib/ext, lib/jsp etc. * List of URLs to the folders where the legacy J2EE shared libraries are stored aka lib/ext, lib/jsp etc.
*/ */
public static final String MANAGED_JETTY_SHARED_LIB_FOLDER_URLS = "managedJettySharedLibFolderUrls"; public static final String MANAGED_JETTY_SHARED_LIB_FOLDER_URLS = "managedJettySharedLibFolderUrls";
} }

16
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
View File

@ -88,8 +88,8 @@ public class DefaultJettyAtJettyHomeHelper
* files. * files.
* </p> * </p>
* <p> * <p>
* In both cases the system properties jetty.host, jetty.port and * In both cases the system properties jetty.http.host, jetty.http.port and
* jetty.port.ssl are passed to the configuration files that might use them * jetty.ssl.port are passed to the configuration files that might use them
* as part of their properties. * as part of their properties.
* </p> * </p>
*/ */
@ -158,7 +158,7 @@ public class DefaultJettyAtJettyHomeHelper
String home=properties.get(OSGiServerConstants.JETTY_HOME); String home=properties.get(OSGiServerConstants.JETTY_HOME);
String base=properties.get(OSGiServerConstants.JETTY_BASE); String base=properties.get(OSGiServerConstants.JETTY_BASE);
if (base==null) if (base==null)
base=home; base=home;
LOG.info("JETTY.HOME="+home); LOG.info("JETTY.HOME="+home);
LOG.info("JETTY.BASE="+base); LOG.info("JETTY.BASE="+base);
ClassLoader contextCl = Thread.currentThread().getContextClassLoader(); ClassLoader contextCl = Thread.currentThread().getContextClassLoader();
@ -169,9 +169,9 @@ public class DefaultJettyAtJettyHomeHelper
// these properties usually are the ones passed to this type of // these properties usually are the ones passed to this type of
// configuration. // configuration.
properties.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME); properties.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME);
Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST)); Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST, System.getProperty("jetty.host")));
Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT)); Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT, System.getProperty("jetty.port")));
Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL)); Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL, System.getProperty("ssl.port")));
Util.setProperty(properties, OSGiServerConstants.JETTY_HOME, home); Util.setProperty(properties, OSGiServerConstants.JETTY_HOME, home);
Util.setProperty(properties, OSGiServerConstants.JETTY_BASE, base); Util.setProperty(properties, OSGiServerConstants.JETTY_BASE, base);
Server server = ServerInstanceWrapper.configure(null, configURLs, properties); Server server = ServerInstanceWrapper.configure(null, configURLs, properties);
@ -185,8 +185,8 @@ public class DefaultJettyAtJettyHomeHelper
} }
catch (Exception e) catch (Exception e)
{ {
LOG.warn(e); LOG.warn(e);
throw e; throw e;
} }
finally finally
{ {

2
jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.server.handler.ContextHandler"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler">

2
jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java
View File

@ -51,7 +51,7 @@ public class Activator implements BundleActivator
Dictionary serverProps = new Hashtable(); Dictionary serverProps = new Hashtable();
//define the unique name of the server instance //define the unique name of the server instance
serverProps.put("managedServerName", serverName); serverProps.put("managedServerName", serverName);
serverProps.put("jetty.port", "9999"); serverProps.put("jetty.http.port", "9999");
//let Jetty apply some configuration files to the Server instance //let Jetty apply some configuration files to the Server instance
serverProps.put("jetty.etc.config.urls", "file:/opt/jetty/etc/jetty.xml,file:/opt/jetty/etc/jetty-selector.xml,file:/opt/jetty/etc/jetty-deployer.xml"); serverProps.put("jetty.etc.config.urls", "file:/opt/jetty/etc/jetty.xml,file:/opt/jetty/etc/jetty-selector.xml,file:/opt/jetty/etc/jetty-deployer.xml");
//register as an OSGi Service for Jetty to find //register as an OSGi Service for Jetty to find

7
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml
View File

@ -31,10 +31,9 @@
</Item> </Item>
</Array> </Array>
</Arg> </Arg>
<Set name="host"><Property name="jetty.host" /></Set> <Set name="host"><Property name="jetty.http.host" /></Set>
<Set name="port"><Property name="jetty.port" default="80" /></Set> <Set name="port"><Property name="jetty.http.port" default="80" /></Set>
<Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set> <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
<Set name="soLingerTime"><Property name="http.soLingerTime" default="-1"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml
View File

@ -9,7 +9,7 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory"> <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig"/></Arg> <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
<Set name="maxConcurrentStreams"><Property name="http2.maxConcurrentStreams" default="1024"/></Set> <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" default="1024"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

22
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml
View File

@ -19,10 +19,10 @@
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
</Array> </Array>
</Arg> </Arg>
<Set name="host"><Property name="jetty.host" /></Set> <Set name="host"><Property name="jetty.ssl.host" /></Set>
<Set name="port"><Property name="ssl.port" default="443" /></Set> <Set name="port"><Property name="jetty.ssl.port" default="443" /></Set>
<Set name="idleTimeout"><Property name="ssl.timeout" default="30000"/></Set> <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" default="30000"/></Set>
<Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set> <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" default="-1"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -31,14 +31,14 @@
<!-- Create a TLS (SSL) Context Factory for later reuse --> <!-- Create a TLS (SSL) Context Factory for later reuse -->
<!-- ============================================================= --> <!-- ============================================================= -->
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="etc/keystore"/></Set> <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.keyStorePath" default="etc/keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="KeyStorePassword"><Property name="jetty.sslConfig.keyStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> <Set name="KeyManagerPassword"><Property name="jetty.sslConfig.keyManagerPassword" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
<Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.truststore" default="etc/keystore"/></Set> <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.trustStorePath" default="etc/keystore"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="TrustStorePassword"><Property name="jetty.sslConfig.trustStorePassword" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set> <Set name="EndpointIdentificationAlgorithm"></Set>
<Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set> <Set name="NeedClientAuth"><Property name="jetty.sslConfig.needClientAuth" default="false"/></Set>
<Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set> <Set name="WantClientAuth"><Property name="jetty.sslConfig.wantClientAuth" default="false"/></Set>
<Set name="ExcludeCipherSuites"> <Set name="ExcludeCipherSuites">
<Array type="String"> <Array type="String">
<Item>SSL_RSA_WITH_DES_CBC_SHA</Item> <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
View File

@ -43,7 +43,7 @@
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Set name="secureScheme">https</Set> <Set name="secureScheme">https</Set>
<Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set> <Set name="securePort"><Property name="jetty.httpConfig.securePort" default="8443" /></Set>
<Set name="outputBufferSize">32768</Set> <Set name="outputBufferSize">32768</Set>
<Set name="requestHeaderSize">8192</Set> <Set name="requestHeaderSize">8192</Set>
<Set name="responseHeaderSize">8192</Set> <Set name="responseHeaderSize">8192</Set>

19
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java
View File

@ -18,18 +18,10 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
@ -48,6 +40,13 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceReference;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* TestJettyOSGiBootContextAsService * TestJettyOSGiBootContextAsService
* *
@ -99,8 +98,8 @@ public class TestJettyOSGiBootContextAsService
+ "/jetty-deployer.xml;" + "/jetty-deployer.xml;"
+ etc + etc
+ "/jetty-testrealm.xml")); + "/jetty-testrealm.xml"));
options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); options.add(systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT)));
options.add(systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); options.add(systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT)));
options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath())); options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath()));
return options; return options;
} }

13
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
View File

@ -18,14 +18,9 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.junit.Ignore; import org.junit.Ignore;
@ -39,6 +34,10 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver; import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* Default OSGi setup integration test * Default OSGi setup integration test
@ -74,8 +73,8 @@ public class TestJettyOSGiBootCore
{ {
List<Option> res = new ArrayList<Option>(); List<Option> res = new ArrayList<Option>();
// get the jetty home config from the osgi boot bundle. // get the jetty home config from the osgi boot bundle.
res.add(CoreOptions.systemProperty("jetty.port").value(String.valueOf(DEFAULT_HTTP_PORT))); res.add(CoreOptions.systemProperty("jetty.http.port").value(String.valueOf(DEFAULT_HTTP_PORT)));
res.add(CoreOptions.systemProperty("ssl.port").value(String.valueOf(DEFAULT_SSL_PORT))); res.add(CoreOptions.systemProperty("jetty.ssl.port").value(String.valueOf(DEFAULT_SSL_PORT)));
res.add(CoreOptions.systemProperty("jetty.home.bundle").value("org.eclipse.jetty.osgi.boot")); res.add(CoreOptions.systemProperty("jetty.home.bundle").value("org.eclipse.jetty.osgi.boot"));
res.addAll(coreJettyDependencies()); res.addAll(coreJettyDependencies());
return res; return res;

13
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java
View File

@ -18,15 +18,10 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.junit.Assert; import org.junit.Assert;
@ -39,6 +34,10 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* HTTP2 setup. * HTTP2 setup.
*/ */
@ -73,8 +72,8 @@ public class TestJettyOSGiBootHTTP2
public static List<Option> http2JettyDependencies() public static List<Option> http2JettyDependencies()
{ {
List<Option> res = new ArrayList<Option>(); List<Option> res = new ArrayList<Option>();
res.add(CoreOptions.systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); res.add(CoreOptions.systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT)));
res.add(CoreOptions.systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); res.add(CoreOptions.systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT)));
String alpnBoot = System.getProperty("mortbay-alpn-boot"); String alpnBoot = System.getProperty("mortbay-alpn-boot");
if (alpnBoot == null) { throw new IllegalStateException("Define path to alpn boot jar as system property -Dmortbay-alpn-boot"); } if (alpnBoot == null) { throw new IllegalStateException("Define path to alpn boot jar as system property -Dmortbay-alpn-boot"); }

19
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
View File

@ -18,18 +18,10 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
@ -48,6 +40,13 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceReference;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* TestJettyOSGiBootWebAppAsService * TestJettyOSGiBootWebAppAsService
* *
@ -102,8 +101,8 @@ public class TestJettyOSGiBootWebAppAsService
+ "/jetty-deployer.xml;" + "/jetty-deployer.xml;"
+ etc + etc
+ "/jetty-testrealm.xml")); + "/jetty-testrealm.xml"));
options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); options.add(systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT)));
options.add(systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); options.add(systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT)));
options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath())); options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath()));
return options; return options;
} }

17
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
View File

@ -18,17 +18,10 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
@ -45,6 +38,12 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* Pax-Exam to make sure the jetty-osgi-boot can be started along with the * Pax-Exam to make sure the jetty-osgi-boot can be started along with the
* httpservice web-bundle. Then make sure we can deploy an OSGi service on the * httpservice web-bundle. Then make sure we can deploy an OSGi service on the
@ -100,8 +99,8 @@ public class TestJettyOSGiBootWithAnnotations
+ "/jetty-testrealm.xml"; + "/jetty-testrealm.xml";
options.add(systemProperty(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS).value(xmlConfigs)); options.add(systemProperty(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS).value(xmlConfigs));
options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); options.add(systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT)));
options.add(systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); options.add(systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT)));
options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath())); options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath()));
return options; return options;
} }

41
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
View File

@ -18,17 +18,10 @@
package org.eclipse.jetty.osgi.test; package org.eclipse.jetty.osgi.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
@ -44,6 +37,12 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/** /**
* Pax-Exam to make sure the jetty-osgi-boot can be started along with the * Pax-Exam to make sure the jetty-osgi-boot can be started along with the
* httpservice web-bundle. Then make sure we can deploy an OSGi service on the * httpservice web-bundle. Then make sure we can deploy an OSGi service on the
@ -84,24 +83,24 @@ public class TestJettyOSGiBootWithJsp
List<Option> options = new ArrayList<Option>(); List<Option> options = new ArrayList<Option>();
String xmlConfigs = etc + "/jetty.xml"; String xmlConfigs = etc + "/jetty.xml";
if (ssl) if (ssl)
xmlConfigs += ";" xmlConfigs += ";"
+ etc + etc
+ "/jetty-ssl.xml;" + "/jetty-ssl.xml;"
+ etc + etc
+ "/jetty-https.xml;"; + "/jetty-https.xml;";
xmlConfigs+= ";" xmlConfigs+= ";"
+ etc + etc
+ "/" + "/"
+ jettySelectorFileName + jettySelectorFileName
+ ";" + ";"
+ etc + etc
+ "/jetty-deployer.xml;" + "/jetty-deployer.xml;"
+ etc + etc
+ "/jetty-testrealm.xml"; + "/jetty-testrealm.xml";
options.add(systemProperty(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS).value(xmlConfigs)); options.add(systemProperty(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS).value(xmlConfigs));
options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); options.add(systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT)));
options.add(systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); options.add(systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT)));
options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath())); options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath()));
options.add(systemProperty("jetty.base").value(etcFolder.getParentFile().getAbsolutePath())); options.add(systemProperty("jetty.base").value(etcFolder.getParentFile().getAbsolutePath()));
return options; return options;

2
jetty-overlay-deployer/src/main/config/etc/jetty-overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Add a ContextProvider to the deployment manager --> <!-- Add a ContextProvider to the deployment manager -->

2
jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=blue/WEB-INF/overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

2
jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=green/WEB-INF/overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

2
jetty-overlay-deployer/src/test/resources/home/overlays/instances/myfoo=red/WEB-INF/overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">

2
jetty-overlay-deployer/src/test/resources/home/overlays/instances/root=root/WEB-INF/overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.server.handler.ContextHandler"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
<!-- <!--

2
jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/jetty-web.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Call class="org.eclipse.jetty.util.log.Log" name="info"><Arg>Executing jetty-web.xml for <Property name="overlay.instance"/></Arg></Call> <Call class="org.eclipse.jetty.util.log.Log" name="info"><Arg>Executing jetty-web.xml for <Property name="overlay.instance"/></Arg></Call>

2
jetty-overlay-deployer/src/test/resources/home/overlays/templates/myfoo=foo/WEB-INF/template.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.overlays.TemplateContext"> <Configure class="org.eclipse.jetty.overlays.TemplateContext">
<Set name="parentLoaderPriority" type="boolean">false</Set> <Set name="parentLoaderPriority" type="boolean">false</Set>

2
jetty-overlay-deployer/src/test/resources/home/overlays/templates/root/WEB-INF/overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd"> <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure_9_0.dtd">
<Configure class="org.eclipse.jetty.server.handler.ContextHandler"> <Configure class="org.eclipse.jetty.server.handler.ContextHandler">

54
jetty-proxy/src/main/config/etc/jetty-proxy.xml
View File

@ -3,33 +3,33 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Set name="handler"> <Set name="handler">
<New class="org.eclipse.jetty.proxy.ConnectHandler"> <New class="org.eclipse.jetty.proxy.ConnectHandler">
<Set name="handler"> <Set name="handler">
<New class="org.eclipse.jetty.servlet.ServletHandler"> <New class="org.eclipse.jetty.servlet.ServletHandler">
<Call id="proxyHolder" name="addServletWithMapping"> <Call id="proxyHolder" name="addServletWithMapping">
<Arg><Property name="jetty.proxy.servletClass" default="org.eclipse.jetty.proxy.ProxyServlet"/></Arg> <Arg><Property name="jetty.proxy.servletClass" default="org.eclipse.jetty.proxy.ProxyServlet"/></Arg>
<Arg><Property name="jetty.proxy.servletMapping" default="/*"/></Arg> <Arg><Property name="jetty.proxy.servletMapping" default="/*"/></Arg>
<Call name="setInitParameter"> <Call name="setInitParameter">
<Arg>maxThreads</Arg> <Arg>maxThreads</Arg>
<Arg><Property name="jetty.proxy.maxThreads" default="128" /></Arg> <Arg><Property name="jetty.proxy.maxThreads" default="128" /></Arg>
</Call> </Call>
<Call name="setInitParameter"> <Call name="setInitParameter">
<Arg>maxConnections</Arg> <Arg>maxConnections</Arg>
<Arg><Property name="jetty.proxy.maxConnections" default="256" /></Arg> <Arg><Property name="jetty.proxy.maxConnections" default="256" /></Arg>
</Call> </Call>
<Call name="setInitParameter"> <Call name="setInitParameter">
<Arg>idleTimeout</Arg> <Arg>idleTimeout</Arg>
<Arg><Property name="jetty.proxy.idleTimeout" default="30000" /></Arg> <Arg><Property name="jetty.proxy.idleTimeout" default="30000" /></Arg>
</Call> </Call>
<Call name="setInitParameter"> <Call name="setInitParameter">
<Arg>timeout</Arg> <Arg>timeout</Arg>
<Arg><Property name="jetty.proxy.timeout" default="60000" /></Arg> <Arg><Property name="jetty.proxy.timeout" default="60000" /></Arg>
</Call> </Call>
</Call> </Call>
</New>
</Set>
</New> </New>
</Set> </Set>
</New>
</Set>
</Configure> </Configure>

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

@ -14,9 +14,9 @@ etc/jetty-proxy.xml
[ini-template] [ini-template]
## Proxy Configuration ## Proxy Configuration
#jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet # jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet
#jetty.proxy.servletMapping=/* # jetty.proxy.servletMapping=/*
#jetty.proxy.maxThreads=128 # jetty.proxy.maxThreads=128
#jetty.proxy.maxConnections=256 # jetty.proxy.maxConnections=256
#jetty.proxy.idleTimeout=30000 # jetty.proxy.idleTimeout=30000
#jetty.proxy.timeout=60000 # jetty.proxy.timeout=60000

50
jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
View File

@ -8,34 +8,32 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- configure rewrite handler --> <!-- configure rewrite handler -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Get id="oldhandler" name="handler"/> <Get id="oldhandler" name="handler"/>
<Set name="handler"> <Set name="handler">
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set> <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="rewriteRequestURI"><Property name="rewrite.rewriteRequestURI" default="true"/></Set> <Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI,rewrite.rewriteRequestURI" default="true"/></Set>
<Set name="rewritePathInfo"><Property name="rewrite.rewritePathInfo" default="false"/></Set> <Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo,rewrite.rewritePathInfo" default="false"/></Set>
<Set name="originalPathAttribute"><Property name="rewrite.originalPathAttribute" default="requestedPath"/></Set> <Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute,rewrite.originalPathAttribute" default="requestedPath"/></Set>
</New> </New>
</Set> </Set>
<!-- example rule --> <!-- example rule -->
<!-- <!--
<Call name="addRule"> <Call name="addRule">
<Arg> <Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule"> <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/favicon.ico</Set> <Set name="pattern">/favicon.ico</Set>
<Set name="name">Cache-Control</Set> <Set name="name">Cache-Control</Set>
<Set name="value">Max-Age=3600,public</Set> <Set name="value">Max-Age=3600,public</Set>
<Set name="terminating">true</Set> <Set name="terminating">true</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
--> -->
<!-- for example rules see jetty-demo.xml -->
</Configure> </Configure>

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

@ -10,3 +10,13 @@ lib/jetty-rewrite-${jetty.version}.jar
[xml] [xml]
etc/jetty-rewrite.xml etc/jetty-rewrite.xml
[ini-template]
## Whether to rewrite the request URI
# jetty.rewrite.rewriteRequestURI=true
## Whether to rewrite the path info
# jetty.rewrite.rewritePathInfo=false
## Request attribute key under with the original path is stored
# jetty.rewrite.originalPathAttribute=requestedPath

9
jetty-rewrite/src/test/resources/org.mortbay.jetty.rewrite.handler/jetty-rewrite.xml
View File

@ -39,12 +39,9 @@
<Call name="addConnector"> <Call name="addConnector">
<Arg> <Arg>
<New class="org.eclipse.jetty.server.ServerConnector"> <New class="org.eclipse.jetty.server.ServerConnector">
<Set name="host"><SystemProperty name="jetty.host" /></Set> <Set name="host"><SystemProperty name="jetty.http.host" /></Set>
<Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> <Set name="port"><SystemProperty name="jetty.http.port" default="8080"/></Set>
<Set name="idleTimeout">30000</Set> <Set name="idleTimeout">30000</Set>
<Set name="Acceptors">2</Set>
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -259,7 +256,7 @@
<Ref refid="RequestLog"> <Ref refid="RequestLog">
<Set name="requestLog"> <Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog"> <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set> <Set name="filename"><SystemProperty name="jetty.requestlog.dir" default="./logs"/>/yyyy_mm_dd.request.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set> <Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="retainDays">90</Set> <Set name="retainDays">90</Set>
<Set name="append">true</Set> <Set name="append">true</Set>

6
jetty-security/src/main/config/etc/krb5.ini
View File

@ -9,9 +9,9 @@ default_tkt_enctypes = aes128-cts aes256-cts arcfour-hmac-md5
[realms] [realms]
MORTBAY.ORG = { MORTBAY.ORG = {
kdc = 192.168.2.30 kdc = 192.168.2.30
admin_server = 192.168.2.30 admin_server = 192.168.2.30
default_domain = MORTBAY.ORG default_domain = MORTBAY.ORG
} }
[domain_realm] [domain_realm]

23
jetty-server/src/main/config/etc/jetty-debug.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Mixin the DebugHandler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler"/>
<Set name="handler">
<New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>
<Arg type="boolean">true</Arg> <!-- append -->
<Arg type="int">90</Arg> <!-- retain days -->
</New>
</Set>
</New>
</Set>
</Configure>

25
jetty-server/src/main/config/etc/jetty-debuglog.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- The DebugHandler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler"/>
<Set name="handler">
<New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="outputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<Arg type="String"><Property name="jetty.debuglog.dir,jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>
<Arg type="boolean"><Property name="jetty.debuglog.append" default="true"/></Arg>
<Arg type="int"><Property name="jetty.debuglog.retainDays" default="90"/></Arg>
<Arg>
<Call class="java.util.TimeZone" name="getTimeZone"><Arg><Property name="jetty.debuglog.timezone" default="GMT"/></Arg></Call>
</Arg>
</New>
</Set>
</New>
</Set>
</Configure>

12
jetty-server/src/main/config/etc/jetty-gzip.xml
View File

@ -13,12 +13,12 @@
<Set name="handler"> <Set name="handler">
<New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler"> <New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
<Set name="handler"><Ref refid="next" /></Set> <Set name="handler"><Ref refid="next" /></Set>
<Set name="minGzipSize"><Property name="gzip.minGzipSize" default="2048"/></Set> <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize,gzip.minGzipSize" default="2048"/></Set>
<Set name="checkGzExists"><Property name="gzip.checkGzExists" default="false"/></Set> <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists,gzip.checkGzExists" default="false"/></Set>
<Set name="compressionLevel"><Property name="gzip.compressionLevel" default="-1"/></Set> <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel,gzip.compressionLevel" default="-1"/></Set>
<Set name="excludedAgentPatterns"> <Set name="excludedAgentPatterns">
<Array type="String"> <Array type="String">
<Item><Property name="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> <Item><Property name="jetty.gzip.excludedUserAgent,gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item>
</Array> </Array>
</Set> </Set>
@ -48,7 +48,7 @@
<Call name="addIncludedMimeTypes"> <Call name="addIncludedMimeTypes">
<Arg><Array type="String"> <Arg><Array type="String">
<Item>some/type</Item> <Item>some/type</Item>
</Array></Arg> </Array></Arg>
</Call> </Call>
--> -->
@ -56,7 +56,7 @@
<Call name="addExcludedMimeTypes"> <Call name="addExcludedMimeTypes">
<Arg><Array type="String"> <Arg><Array type="String">
<Item>some/type</Item> <Item>some/type</Item>
</Array></Arg> </Array></Arg>
</Call> </Call>
--> -->

19
jetty-server/src/main/config/etc/jetty-http.xml
View File

@ -22,12 +22,12 @@
<Arg> <Arg>
<New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector"> <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref refid="Server" /></Arg> <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="acceptors" type="int"><Property name="http.acceptors" default="-1"/></Arg> <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors,http.acceptors" default="-1"/></Arg>
<Arg name="selectors" type="int"><Property name="http.selectors" default="-1"/></Arg> <Arg name="selectors" type="int"><Property name="jetty.http.selectors,http.selectors" default="-1"/></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
<!-- uncomment to support proxy protocol <!-- uncomment to support proxy protocol
<Item> <Item>
<New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
</Item>--> </Item>-->
<Item> <Item>
@ -37,13 +37,12 @@
</Item> </Item>
</Array> </Array>
</Arg> </Arg>
<Set name="host"><Property name="jetty.host" /></Set> <Set name="host"><Property name="jetty.http.host,jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="80" /></Set> <Set name="port"><Property name="jetty.http.port,jetty.port" default="80" /></Set>
<Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set> <Set name="idleTimeout"><Property name="jetty.http.idleTimeout,http.timeout" default="30000"/></Set>
<Set name="soLingerTime"><Property name="http.soLingerTime" default="-1"/></Set> <Set name="soLingerTime"><Property name="jetty.http.soLingerTime,http.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="http.acceptorPriorityDelta" default="0"/></Set> <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta,http.acceptorPriorityDelta" default="0"/></Set>
<Set name="selectorPriorityDelta"><Property name="http.selectorPriorityDelta" default="0"/></Set> <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize,http.acceptQueueSize" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="http.acceptQueueSize" default="0"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

26
jetty-server/src/main/config/etc/jetty-ipaccess.xml
View File

@ -2,30 +2,30 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Mixin the Statistics Handler --> <!-- The IP Access Handler -->
<!-- =============================================================== --> <!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler"/> <Get id="oldhandler" name="handler"/>
<Set name="handler"> <Set name="handler">
<New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler"> <New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set> <Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="white"> <Set name="white">
<Array type="String"> <Array type="String">
<Item>127.0.0.1</Item> <Item>127.0.0.1</Item>
<Item>127.0.0.2/*.html</Item> <Item>127.0.0.2/*.html</Item>
</Array> </Array>
</Set> </Set>
<Set name="black"> <Set name="black">
<Array type="String"> <Array type="String">
<Item>127.0.0.1/blacklisted</Item> <Item>127.0.0.1/blacklisted</Item>
<Item>127.0.0.2/black.html</Item> <Item>127.0.0.2/black.html</Item>
</Array> </Array>
</Set> </Set>
<Set name="whiteListByPath">false</Set> <Set name="whiteListByPath">false</Set>
</New> </New>
</Set> </Set>
</Configure> </Configure>

12
jetty-server/src/main/config/etc/jetty-lowresources.xml
View File

@ -10,12 +10,12 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.LowResourceMonitor"> <New class="org.eclipse.jetty.server.LowResourceMonitor">
<Arg name="server"><Ref refid='Server'/></Arg> <Arg name="server"><Ref refid='Server'/></Arg>
<Set name="period"><Property name="lowresources.period" default="1000"/></Set> <Set name="period"><Property name="jetty.lowresources.period,lowresources.period" default="1000"/></Set>
<Set name="lowResourcesIdleTimeout"><Property name="lowresources.lowResourcesIdleTimeout" default="200"/></Set> <Set name="lowResourcesIdleTimeout"><Property name="jetty.lowresources.idleTimeout,lowresources.lowResourcesIdleTimeout" default="1000"/></Set>
<Set name="monitorThreads"><Property name="lowresources.monitorThreads" default="true"/></Set> <Set name="monitorThreads"><Property name="jetty.lowresources.monitorThreads,lowresources.monitorThreads" default="true"/></Set>
<Set name="maxConnections"><Property name="lowresources.maxConnections" default="0"/></Set> <Set name="maxConnections"><Property name="jetty.lowresources.maxConnections,lowresources.maxConnections" default="0"/></Set>
<Set name="maxMemory"><Property name="lowresources.maxMemory" default="0"/></Set> <Set name="maxMemory"><Property name="jetty.lowresources.maxMemory,lowresources.maxMemory" default="0"/></Set>
<Set name="maxLowResourcesTime"><Property name="lowresources.maxLowResourcesTime" default="5000"/></Set> <Set name="maxLowResourcesTime"><Property name="jetty.lowresources.maxLowResourcesTime,lowresources.maxLowResourcesTime" default="5000"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>

14
jetty-server/src/main/config/etc/jetty-requestlog.xml
View File

@ -12,13 +12,13 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<Set name="RequestLog"> <Set name="RequestLog">
<New id="RequestLog" class="org.eclipse.jetty.server.AsyncNCSARequestLog"> <New id="RequestLog" class="org.eclipse.jetty.server.AsyncNCSARequestLog">
<Set name="filename"><Property name="jetty.base" default="." /><Property name="requestlog.filename" default="/logs/yyyy_mm_dd.request.log"/></Set> <Set name="filename"><Property name="jetty.base" default="." /><Property name="jetty.requestlog.filePath,requestlog.filename" default="/logs/yyyy_mm_dd.request.log"/></Set>
<Set name="filenameDateFormat"><Property name="requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat,requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set>
<Set name="retainDays"><Property name="requestlog.retain" default="90"/></Set> <Set name="retainDays"><Property name="jetty.requestlog.retainDays,requestlog.retain" default="90"/></Set>
<Set name="append"><Property name="requestlog.append" default="false"/></Set> <Set name="append"><Property name="jetty.requestlog.append,requestlog.append" default="false"/></Set>
<Set name="extended"><Property name="requestlog.extended" default="false"/></Set> <Set name="extended"><Property name="jetty.requestlog.extended,requestlog.extended" default="false"/></Set>
<Set name="logCookies"><Property name="requestlog.cookies" default="false"/></Set> <Set name="logCookies"><Property name="jetty.requestlog.cookies,requestlog.cookies" default="false"/></Set>
<Set name="LogTimeZone"><Property name="requestlog.timezone" default="GMT"/></Set> <Set name="LogTimeZone"><Property name="jetty.requestlog.timezone,requestlog.timezone" default="GMT"/></Set>
</New> </New>
</Set> </Set>
</Configure> </Configure>

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

@ -15,24 +15,23 @@
<Arg> <Arg>
<New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Arg name="server"><Ref refid="Server" /></Arg> <Arg name="server"><Ref refid="Server" /></Arg>
<Arg name="acceptors" type="int"><Property name="ssl.acceptors" default="-1"/></Arg> <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors,ssl.acceptors" default="-1"/></Arg>
<Arg name="selectors" type="int"><Property name="ssl.selectors" default="-1"/></Arg> <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors,ssl.selectors" default="-1"/></Arg>
<Arg name="factories"> <Arg name="factories">
<Array type="org.eclipse.jetty.server.ConnectionFactory"> <Array type="org.eclipse.jetty.server.ConnectionFactory">
<!-- uncomment to support proxy protocol <!-- uncomment to support proxy protocol
<Item> <Item>
<New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
</Item>--> </Item>-->
</Array> </Array>
</Arg> </Arg>
<Set name="host"><Property name="jetty.host" /></Set> <Set name="host"><Property name="jetty.ssl.host,jetty.host" /></Set>
<Set name="port"><Property name="ssl.port" default="443" /></Set> <Set name="port"><Property name="jetty.ssl.port,ssl.port" default="443" /></Set>
<Set name="idleTimeout"><Property name="ssl.timeout" default="30000"/></Set> <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout,ssl.timeout" default="30000"/></Set>
<Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set> <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime,ssl.soLingerTime" default="-1"/></Set>
<Set name="acceptorPriorityDelta"><Property name="ssl.acceptorPriorityDelta" default="0"/></Set> <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta,ssl.acceptorPriorityDelta" default="0"/></Set>
<Set name="selectorPriorityDelta"><Property name="ssl.selectorPriorityDelta" default="0"/></Set> <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize,ssl.acceptQueueSize" default="0"/></Set>
<Set name="acceptQueueSize"><Property name="ssl.acceptQueueSize" default="0"/></Set>
</New> </New>
</Arg> </Arg>
</Call> </Call>
@ -41,14 +40,14 @@
<!-- Create a TLS (SSL) Context Factory for later reuse --> <!-- Create a TLS (SSL) Context Factory for later reuse -->
<!-- ============================================================= --> <!-- ============================================================= -->
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="etc/keystore"/></Set> <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.keyStorePath,jetty.keystore" default="etc/keystore"/></Set>
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="KeyStorePassword"><Property name="jetty.sslConfig.keyStorePassword,jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> <Set name="KeyManagerPassword"><Property name="jetty.sslConfig.keyManagerPassword,jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
<Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.truststore" default="etc/keystore"/></Set> <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.trustStorePath,jetty.truststore" default="etc/keystore"/></Set>
<Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> <Set name="TrustStorePassword"><Property name="jetty.sslConfig.trustStorePassword,jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
<Set name="EndpointIdentificationAlgorithm"></Set> <Set name="EndpointIdentificationAlgorithm"></Set>
<Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set> <Set name="NeedClientAuth"><Property name="jetty.sslConfig.needClientAuth,jetty.ssl.needClientAuth" default="false"/></Set>
<Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set> <Set name="WantClientAuth"><Property name="jetty.sslConfig.wantClientAuth,jetty.ssl.wantClientAuth" default="false"/></Set>
<Set name="ExcludeCipherSuites"> <Set name="ExcludeCipherSuites">
<Array type="String"> <Array type="String">
<Item>SSL_RSA_WITH_DES_CBC_SHA</Item> <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>

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

@ -46,9 +46,9 @@
<Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg> <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
--> -->
<Get name="ThreadPool"> <Get name="ThreadPool">
<Set name="minThreads" type="int"><Property name="threads.min" default="10"/></Set> <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads,threads.min" default="10"/></Set>
<Set name="maxThreads" type="int"><Property name="threads.max" default="200"/></Set> <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads,threads.max" default="200"/></Set>
<Set name="idleTimeout" type="int"><Property name="threads.timeout" default="60000"/></Set> <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout,threads.timeout" default="60000"/></Set>
<Set name="detailedDump">false</Set> <Set name="detailedDump">false</Set>
</Get> </Get>
@ -77,16 +77,16 @@
<!-- for all configuration that may be set here. --> <!-- for all configuration that may be set here. -->
<!-- =========================================================== --> <!-- =========================================================== -->
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
<Set name="secureScheme">https</Set> <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
<Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set> <Set name="securePort"><Property name="jetty.httpConfig.securePort,jetty.secure.port" default="8443" /></Set>
<Set name="outputBufferSize"><Property name="jetty.output.buffer.size" default="32768" /></Set> <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize,jetty.output.buffer.size" default="32768" /></Set>
<Set name="outputAggregationSize"><Property name="jetty.output.aggregation.size" default="8192" /></Set> <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize,jetty.output.aggregation.size" default="8192" /></Set>
<Set name="requestHeaderSize"><Property name="jetty.request.header.size" default="8192" /></Set> <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize,jetty.request.header.size" default="8192" /></Set>
<Set name="responseHeaderSize"><Property name="jetty.response.header.size" default="8192" /></Set> <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize,jetty.response.header.size" default="8192" /></Set>
<Set name="sendServerVersion"><Property name="jetty.send.server.version" default="true" /></Set> <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion,jetty.send.server.version" default="true" /></Set>
<Set name="sendDateHeader"><Property name="jetty.send.date.header" default="false" /></Set> <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader,jetty.send.date.header" default="false" /></Set>
<Set name="headerCacheSize">512</Set> <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
<Set name="delayDispatchUntilContent"><Property name="jetty.delayDispatchUntilContent" default="true"/></Set> <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent,jetty.delayDispatchUntilContent" default="true"/></Set>
<!-- Uncomment to enable handling of X-Forwarded- style headers <!-- Uncomment to enable handling of X-Forwarded- style headers
<Call name="addCustomizer"> <Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg> <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
@ -94,7 +94,6 @@
--> -->
</New> </New>
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Set the default handler structure for the Server --> <!-- Set the default handler structure for the Server -->
<!-- A handler collection is used to pass received requests to --> <!-- A handler collection is used to pass received requests to -->
@ -124,9 +123,9 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- extra server options --> <!-- extra server options -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Set name="stopAtShutdown">true</Set> <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
<Set name="stopTimeout">5000</Set> <Set name="stopTimeout">5000</Set>
<Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set> <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart,jetty.dump.start" default="false"/></Set>
<Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set> <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop,jetty.dump.stop" default="false"/></Set>
</Configure> </Configure>

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

@ -1,12 +0,0 @@
#
# Debug module
#
[depend]
server
[files]
logs/
[xml]
etc/jetty-debug.xml

25
jetty-server/src/main/config/modules/debuglog.mod Normal file
View File

@ -0,0 +1,25 @@
#
# Debug module
#
[depend]
server
[files]
logs/
[xml]
etc/jetty-debug.xml
[ini-template]
## Logging directory (relative to $jetty.base)
# jetty.debuglog.dir=logs
## Whether to append to existing file
# jetty.debuglog.append=false
## How many days to retain old log files
# jetty.debuglog.retainDays=90
## Timezone of the log entries
# jetty.debuglog.timezone=GMT

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

@ -10,9 +10,14 @@ server
etc/jetty-gzip.xml etc/jetty-gzip.xml
[ini-template] [ini-template]
### Gzip Handler ## Minimum content length after which gzip is enabled
# jetty.gzip.minGzipSize=2048
gzip.minGzipSize=2048 ## Check whether a file with *.gz extension exists
gzip.checkGzExists=false # jetty.gzip.checkGzExists=false
gzip.compressionLevel=-1
gzip.excludedUserAgent=.*MSIE.6\.0.* ## Gzip compression level (-1 for default)
# jetty.gzip.compressionLevel=-1
## User agents for which gzip is disabled
# jetty.gzip.excludedUserAgent=.*MSIE.6\.0.*

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

@ -11,17 +11,26 @@ etc/jetty-http.xml
[ini-template] [ini-template]
### HTTP Connector Configuration ### HTTP Connector Configuration
## HTTP port to listen on ## Connector host/address to bind to
jetty.port=8080 # jetty.http.host=0.0.0.0
## HTTP idle timeout in milliseconds ## Connector port to listen on
http.timeout=30000 # jetty.http.port=80
## HTTP Socket.soLingerTime in seconds. (-1 to disable) ## Connector idle timeout in milliseconds
# http.soLingerTime=-1 # jetty.http.idleTimeout=30000
## Parameters to control the number and priority of acceptors and selectors ## Connector socket linger time in seconds (-1 to disable)
# http.selectors=1 # jetty.http.soLingerTime=-1
# http.acceptors=1
# http.selectorPriorityDelta=0 ## Number of acceptors (-1 picks default based on number of cores)
# http.acceptorPriorityDelta=0 # jetty.http.acceptors=-1
## Number of selectors (-1 picks default based on number of cores)
# jetty.http.selectors=-1
## ServerSocketChannel backlog (0 picks platform default)
# jetty.http.acceptorQueueSize=0
## Thread priority delta to give to acceptor threads
# jetty.http.acceptorPriorityDelta=0

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

@ -9,10 +9,20 @@ server
etc/jetty-lowresources.xml etc/jetty-lowresources.xml
[ini-template] [ini-template]
## Low Resources Configuration ## Scan period to look for low resources (in milliseconds)
# lowresources.period=1050 # jetty.lowresources.period=1000
# lowresources.lowResourcesIdleTimeout=200
# lowresources.monitorThreads=true ## The idle timeout to apply to low resources (in milliseconds)
# lowresources.maxConnections=0 # jetty.lowresources.idleTimeout=1000
# lowresources.maxMemory=0
# lowresources.maxLowResourcesTime=5000 ## Whether to monitor ThreadPool threads for low resources
# jetty.lowresources.monitorThreads=true
## Max number of connections allowed before being in low resources mode
# jetty.lowresources.maxConnections=0
## Max memory allowed before being in low resources mode (in bytes)
# jetty.lowresources.maxMemory=0
## Max time a resource may stay in low resource mode before actions are taken (in milliseconds)
# jetty.lowresources.maxLowResourcesTime=5000

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

@ -12,19 +12,23 @@ etc/jetty-requestlog.xml
logs/ logs/
[ini-template] [ini-template]
## Request Log Configuration ## File path (relative to $jetty.base)
# Filename for Request Log output (relative to jetty.base) # jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log
# requestlog.filename=/logs/yyyy_mm_dd.request.log
# Date format for rollovered files (uses SimpleDateFormat syntax)
# requestlog.filenameDateFormat=yyyy_MM_dd
# How many days to retain the logs
# requestlog.retain=90
# If an existing log with the same name is found, just append to it
# requestlog.append=true
# Use the extended log output
# requestlog.extended=true
# Log http cookie information as well
# requestlog.cookies=true
# Set the log output timezone
# requestlog.timezone=GMT
# Date format for rollovered files (uses SimpleDateFormat syntax)
# jetty.requestlog.filenameDateFormat=yyyy_MM_dd
# How many days to retain old log files
# jetty.requestlog.retainDays=90
## Whether to append to existing file
# jetty.requestlog.append=true
# Whether to use the extended log output
# jetty.requestlog.extended=true
# Whether to log http cookie information
# jetty.requestlog.cookies=true
## Timezone of the log entries
# jetty.requestlog.timezone=GMT

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

@ -20,41 +20,53 @@ lib/jetty-io-${jetty.version}.jar
etc/jetty.xml etc/jetty.xml
[ini-template] [ini-template]
## ### ThreadPool configuration
## Server Threading Configuration ## Minimum number of threads
## # jetty.threadPool.minThreads=10
# minimum number of threads
threads.min=10
# maximum number of threads ## Maximum number of threads
threads.max=200 # jetty.threadPool.maxThreads=200
# thread idle timeout in milliseconds ## Thread idle timeout (in milliseconds)
threads.timeout=60000 # jetty.threadPool.idleTimeout=60000
# buffer size for output ### Common HTTP configuration
jetty.output.buffer.size=32768 ## Scheme to use to build URIs for secure redirects
# jetty.httpConfig.secureScheme=https
# request header buffer size ## Port to use to build URIs for secure redirects
jetty.request.header.size=8192 # jetty.httpConfig.securePort=8443
# response header buffer size ## Response content buffer size (in bytes)
jetty.response.header.size=8192 # jetty.httpConfig.outputBufferSize=32768
# should jetty send the server version header? ## Max response content write length that is buffered (in bytes)
jetty.send.server.version=true # jetty.httpConfig.outputAggregationSize=8192
# should jetty send the date header? ## Max request headers size (in bytes)
jetty.send.date.header=false # jetty.httpConfig.requestHeaderSize=8192
# What host to listen on (leave commented to listen on all interfaces) ## Max response headers size (in bytes)
#jetty.host=myhost.com # jetty.httpConfig.responseHeaderSize=8192
# Enable delayed dispatch optimisation ## Whether to send the Server: header
jetty.delayDispatchUntilContent=true # jetty.httpConfig.sendServerVersion=true
# Dump the state of the Jetty server, components, and webapps after startup ## Whether to send the Date: header
jetty.dump.start=false # jetty.httpConfig.sendDateHeader=false
# Dump the state of the Jetty server, before stop ## Max per-connection header cache size (in nodes)
jetty.dump.stop=false # jetty.httpConfig.headerCacheSize=512
## Whether, for requests with content, delay dispatch until some content has arrived
# jetty.httpConfig.delayDispatchUntilContent=true
### Server configuration
## Whether ctrl+c on the console gracefully stops the Jetty server
# jetty.server.stopAtShutdown=true
## Dump the state of the Jetty server, components, and webapps after startup
# jetty.server.dumpAfterStart=false
## Dump the state of the Jetty server, components, and webapps before shutdown
# jetty.server.dumpBeforeStop=false

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

@ -12,36 +12,54 @@ etc/jetty-ssl.xml
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
[ini-template] [ini-template]
### SSL Keystore Configuration ### TLS(SSL) Connector Configuration
# define the port to use for secure redirection
jetty.secure.port=8443
# SSL port to listen on ## Connector host/address to bind to
ssl.port=8443 # jetty.ssl.host=0.0.0.0
# SSL idle timeout in milliseconds
ssl.timeout=30000
# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
# ssl.soLingerTime=-1
## Setup a demonstration keystore and truststore ## Connector port to listen on
jetty.keystore=etc/keystore # jetty.ssl.port=443
jetty.truststore=etc/keystore
## Connector idle timeout in milliseconds
# jetty.ssl.idleTimeout=30000
## Connector socket linger time in seconds (-1 to disable)
# jetty.ssl.soLingerTime=-1
## Number of acceptors (-1 picks default based on number of cores)
# jetty.ssl.acceptors=-1
## Number of selectors (-1 picks default based on number of cores)
# jetty.ssl.selectors=-1
## ServerSocketChannel backlog (0 picks platform default)
# jetty.ssl.acceptorQueueSize=0
## Thread priority delta to give to acceptor threads
# jetty.ssl.acceptorPriorityDelta=0
### SslContextFactory Configuration
## Keystore file path (relative to $jetty.base)
# jetty.sslConfig.keyStorePath=etc/keystore
## Truststore file path (relative to $jetty.base)
# jetty.sslConfig.trustStorePath=etc/keystore
## Set the demonstration passwords.
## Note that OBF passwords are not secure, just protected from casual observation ## Note that OBF passwords are not secure, just protected from casual observation
## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
### Set the client auth behavior ## Keystore password
## Set to true if client certificate authentication is required # jetty.sslConfig.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
# jetty.ssl.needClientAuth=true
## Set to true if client certificate authentication is desired
# jetty.ssl.wantClientAuth=true
## Parameters to control the number and priority of acceptors and selectors ## KeyManager password
# ssl.selectors=1 # jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
# ssl.acceptors=1
# ssl.selectorPriorityDelta=0 ## Truststore password
# ssl.acceptorPriorityDelta=0 # jetty.sslConfig.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
## whether client certificate authentication is required
# jetty.sslConfig.needClientAuth=false
## Whether client certificate authentication is desired
# jetty.sslConfig.wantClientAuth=false

19
jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
View File

@ -197,7 +197,7 @@ public class ServerConnector extends AbstractNetworkConnector
@Name("sslContextFactory") SslContextFactory sslContextFactory, @Name("sslContextFactory") SslContextFactory sslContextFactory,
@Name("factories") ConnectionFactory... factories) @Name("factories") ConnectionFactory... factories)
{ {
this(server,null,null,null,-1,-1,AbstractConnectionFactory.getFactories(sslContextFactory,factories)); this(server, null, null, null, -1, -1, AbstractConnectionFactory.getFactories(sslContextFactory, factories));
} }
/** Generic Server Connection. /** Generic Server Connection.
@ -259,24 +259,19 @@ public class ServerConnector extends AbstractNetworkConnector
return channel!=null && channel.isOpen(); return channel!=null && channel.isOpen();
} }
/**
@ManagedAttribute("The priority delta to apply to selector threads") * @deprecated not implemented
*/
@Deprecated
public int getSelectorPriorityDelta() public int getSelectorPriorityDelta()
{ {
return _manager.getSelectorPriorityDelta(); return _manager.getSelectorPriorityDelta();
} }
/** /**
* Sets the selector thread priority delta to the given amount. * @deprecated not implemented
* <p>This allows the selector threads to run at a different priority.
* Typically this would be used to lower the priority to give preference
* to handling previously accepted connections rather than accepting
* new connections.</p>
*
* @param selectorPriorityDelta the amount to set the thread priority delta to
* (may be negative)
* @see Thread#getPriority()
*/ */
@Deprecated
public void setSelectorPriorityDelta(int selectorPriorityDelta) public void setSelectorPriorityDelta(int selectorPriorityDelta)
{ {
_manager.setSelectorPriorityDelta(selectorPriorityDelta); _manager.setSelectorPriorityDelta(selectorPriorityDelta);

110
jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java
View File

@ -18,10 +18,6 @@
package org.eclipse.jetty.start; package org.eclipse.jetty.start;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -36,6 +32,10 @@ import org.junit.Assert;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
public class IncludeJettyDirTest public class IncludeJettyDirTest
{ {
private static class MainResult private static class MainResult
@ -97,7 +97,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
// Simple command line - no reference to include-jetty-dirs // Simple command line - no reference to include-jetty-dirs
MainResult result = runMain(base,home); MainResult result = runMain(base,home);
@ -107,7 +107,7 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
} }
@Test @Test
@ -121,13 +121,13 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
// Simple command line reference to include-jetty-dir // Simple command line reference to include-jetty-dir
MainResult result = runMain(base,home, MainResult result = runMain(base,home,
@ -140,8 +140,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -155,13 +155,13 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
// Simple command line reference to include-jetty-dir via property (also on command line) // Simple command line reference to include-jetty-dir via property (also on command line)
MainResult result = runMain(base,home, MainResult result = runMain(base,home,
@ -176,8 +176,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -195,13 +195,13 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = new File(opt,"common"); File common = new File(opt,"common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "common"; String dirRef = "${my.opt}" + File.separator + "common";
@ -218,8 +218,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -237,13 +237,13 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = new File(opt,"common"); File common = new File(opt,"common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "${my.dir}"; String dirRef = "${my.opt}" + File.separator + "${my.dir}";
@ -262,8 +262,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -277,13 +277,13 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home); MainResult result = runMain(base,home);
@ -294,8 +294,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -309,7 +309,7 @@ public class IncludeJettyDirTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create corp // Create corp
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
@ -319,7 +319,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath(), // "--include-jetty-dir=" + common.getAbsolutePath(), //
"--include-jetty-dir=" + corp.getAbsolutePath()); "--include-jetty-dir=" + corp.getAbsolutePath());
@ -332,8 +332,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -347,20 +347,20 @@ public class IncludeJettyDirTest
// Create corp // Create corp
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini","jetty.port=9090"); TestEnv.makeFile(corp,"start.ini","jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home); MainResult result = runMain(base,home);
@ -372,8 +372,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -388,7 +388,7 @@ public class IncludeJettyDirTest
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
@ -396,13 +396,13 @@ public class IncludeJettyDirTest
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), // "my.corp=" + corp.getAbsolutePath(), //
"--include-jetty-dir=${my.corp}", // "--include-jetty-dir=${my.corp}", //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"my.common=" + common.getAbsolutePath(), // "my.common=" + common.getAbsolutePath(), //
"--include-jetty-dir=${my.common}"); "--include-jetty-dir=${my.common}");
@ -415,8 +415,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","8080"); // from 'common' result.assertProperty("jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -432,26 +432,26 @@ public class IncludeJettyDirTest
FS.ensureEmpty(devops); FS.ensureEmpty(devops);
TestEnv.makeFile(devops,"start.ini", // TestEnv.makeFile(devops,"start.ini", //
"--module=logging", // "--module=logging", //
"jetty.port=2222"); "jetty.http.port=2222");
// Create corp // Create corp
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home, MainResult result = runMain(base,home,
@ -466,8 +466,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","2222"); // from 'devops' result.assertProperty("jetty.http.port","2222"); // from 'devops'
} }
@Test @Test
@ -482,25 +482,25 @@ public class IncludeJettyDirTest
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
MainResult result = runMain(base,home, MainResult result = runMain(base,home,
// command line property should override all others // command line property should override all others
"jetty.port=7070"); "jetty.http.port=7070");
List<String> expectedSearchOrder = new ArrayList<>(); List<String> expectedSearchOrder = new ArrayList<>();
expectedSearchOrder.add("${jetty.base}"); expectedSearchOrder.add("${jetty.base}");
@ -509,8 +509,8 @@ public class IncludeJettyDirTest
expectedSearchOrder.add("${jetty.home}"); expectedSearchOrder.add("${jetty.home}");
result.assertSearchOrder(expectedSearchOrder); result.assertSearchOrder(expectedSearchOrder);
result.assertProperty("jetty.host","127.0.0.1"); result.assertProperty("jetty.http.host","127.0.0.1");
result.assertProperty("jetty.port","7070"); // from command line result.assertProperty("jetty.http.port","7070"); // from command line
} }
@Test @Test
@ -530,14 +530,14 @@ public class IncludeJettyDirTest
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", TestEnv.makeFile(corp,"start.ini",
// standard property // standard property
"jetty.port=9090", "jetty.http.port=9090",
// INTENTIONAL BAD Reference (duplicate) // INTENTIONAL BAD Reference (duplicate)
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
// Populate common // Populate common
TestEnv.makeFile(common,"start.ini", TestEnv.makeFile(common,"start.ini",
// standard property // standard property
"jetty.port=8080", "jetty.http.port=8080",
// reference to corp // reference to corp
"--include-jetty-dir=" + corp.getAbsolutePath()); "--include-jetty-dir=" + corp.getAbsolutePath());
@ -545,7 +545,7 @@ public class IncludeJettyDirTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
try try

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

@ -18,10 +18,6 @@
package org.eclipse.jetty.start; package org.eclipse.jetty.start;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.io.File; import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -35,6 +31,10 @@ import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
public class MainTest public class MainTest
{ {
@Rule @Rule
@ -54,7 +54,7 @@ public class MainTest
File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home").getAbsoluteFile(); File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home").getAbsoluteFile();
cmdLineArgs.add("user.dir=" + testJettyHome); cmdLineArgs.add("user.dir=" + testJettyHome);
cmdLineArgs.add("jetty.home=" + testJettyHome); cmdLineArgs.add("jetty.home=" + testJettyHome);
cmdLineArgs.add("jetty.port=9090"); cmdLineArgs.add("jetty.http.port=9090");
Main main = new Main(); Main main = new Main();
StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()]));
@ -90,7 +90,7 @@ public class MainTest
List<String> cmdLineArgs = new ArrayList<>(); List<String> cmdLineArgs = new ArrayList<>();
File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home"); File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home");
cmdLineArgs.add("jetty.home=" + testJettyHome); cmdLineArgs.add("jetty.home=" + testJettyHome);
cmdLineArgs.add("jetty.port=9090"); cmdLineArgs.add("jetty.http.port=9090");
cmdLineArgs.add("--list-config"); cmdLineArgs.add("--list-config");
// cmdLineArgs.add("--debug"); // cmdLineArgs.add("--debug");

10
jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
View File

@ -18,10 +18,6 @@
package org.eclipse.jetty.start; package org.eclipse.jetty.start;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -41,6 +37,10 @@ import org.eclipse.jetty.toolchain.test.TestingDir;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
public class ModulesTest public class ModulesTest
{ {
private final static String TEST_SOURCE = "<test>"; private final static String TEST_SOURCE = "<test>";
@ -92,7 +92,7 @@ public class ModulesTest
expected.add("cdi"); expected.add("cdi");
expected.add("client"); expected.add("client");
expected.add("continuation"); expected.add("continuation");
expected.add("debug"); expected.add("debuglog");
expected.add("deploy"); expected.add("deploy");
expected.add("ext"); expected.add("ext");
expected.add("fcgi"); expected.add("fcgi");

102
jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java
View File

@ -18,10 +18,6 @@
package org.eclipse.jetty.start.config; package org.eclipse.jetty.start.config;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -38,6 +34,10 @@ import org.junit.Assert;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
public class ConfigSourcesTest public class ConfigSourcesTest
{ {
@Rule @Rule
@ -91,7 +91,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -119,7 +119,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -143,13 +143,13 @@ public class ConfigSourcesTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -169,8 +169,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home); assertDirOrder(sources,base,common,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -188,13 +188,13 @@ public class ConfigSourcesTest
// Create common // Create common
File common = new File(opt,"common"); File common = new File(opt,"common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "common"; String dirRef = "${my.opt}" + File.separator + "common";
@ -215,8 +215,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home); assertDirOrder(sources,base,common,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -234,13 +234,13 @@ public class ConfigSourcesTest
// Create common // Create common
File common = new File(opt,"common"); File common = new File(opt,"common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1"); "jetty.http.host=127.0.0.1");
String dirRef = "${my.opt}" + File.separator + "${my.dir}"; String dirRef = "${my.opt}" + File.separator + "${my.dir}";
@ -264,8 +264,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home); assertDirOrder(sources,base,common,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -279,13 +279,13 @@ public class ConfigSourcesTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -299,8 +299,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,home); assertDirOrder(sources,base,common,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -314,7 +314,7 @@ public class ConfigSourcesTest
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini","jetty.port=8080"); TestEnv.makeFile(common,"start.ini","jetty.http.port=8080");
// Create corp // Create corp
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
@ -324,7 +324,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath(), // "--include-jetty-dir=" + common.getAbsolutePath(), //
"--include-jetty-dir=" + corp.getAbsolutePath()); "--include-jetty-dir=" + corp.getAbsolutePath());
@ -342,8 +342,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home); assertDirOrder(sources,base,common,corp,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -358,20 +358,20 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -388,8 +388,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home); assertDirOrder(sources,base,common,corp,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -404,7 +404,7 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
@ -412,13 +412,13 @@ public class ConfigSourcesTest
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"my.corp=" + corp.getAbsolutePath(), // "my.corp=" + corp.getAbsolutePath(), //
"--include-jetty-dir=${my.corp}", // "--include-jetty-dir=${my.corp}", //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"my.common="+common.getAbsolutePath(), // "my.common="+common.getAbsolutePath(), //
"--include-jetty-dir=${my.common}"); "--include-jetty-dir=${my.common}");
@ -437,8 +437,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home); assertDirOrder(sources,base,common,corp,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","8080"); // from 'common' assertProperty(sources,"jetty.http.port","8080"); // from 'common'
} }
@Test @Test
@ -454,26 +454,26 @@ public class ConfigSourcesTest
FS.ensureEmpty(devops); FS.ensureEmpty(devops);
TestEnv.makeFile(devops,"start.ini", // TestEnv.makeFile(devops,"start.ini", //
"--module=logging", // "--module=logging", //
"jetty.port=2222"); "jetty.http.port=2222");
// Create corp // Create corp
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
@ -494,8 +494,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,devops,common,corp,home); assertDirOrder(sources,base,devops,common,corp,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","2222"); // from 'common' assertProperty(sources,"jetty.http.port","2222"); // from 'common'
} }
@Test @Test
@ -510,27 +510,27 @@ public class ConfigSourcesTest
File corp = testdir.getFile("corp"); File corp = testdir.getFile("corp");
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", // TestEnv.makeFile(corp,"start.ini", //
"jetty.port=9090"); "jetty.http.port=9090");
// Create common // Create common
File common = testdir.getFile("common"); File common = testdir.getFile("common");
FS.ensureEmpty(common); FS.ensureEmpty(common);
TestEnv.makeFile(common,"start.ini", // TestEnv.makeFile(common,"start.ini", //
"--include-jetty-dir=" + corp.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath(), //
"jetty.port=8080"); "jetty.http.port=8080");
// Create base // Create base
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();
String cmdLine[] = new String[]{ String cmdLine[] = new String[]{
// command line property should override all others // command line property should override all others
"jetty.port=7070" "jetty.http.port=7070"
}; };
sources.add(new CommandLineConfigSource(cmdLine)); sources.add(new CommandLineConfigSource(cmdLine));
sources.add(new JettyHomeConfigSource(home.toPath())); sources.add(new JettyHomeConfigSource(home.toPath()));
@ -543,8 +543,8 @@ public class ConfigSourcesTest
assertDirOrder(sources,base,common,corp,home); assertDirOrder(sources,base,common,corp,home);
assertProperty(sources,"jetty.host","127.0.0.1"); assertProperty(sources,"jetty.http.host","127.0.0.1");
assertProperty(sources,"jetty.port","7070"); // from <command-line> assertProperty(sources,"jetty.http.port","7070"); // from <command-line>
} }
@Test @Test
@ -564,14 +564,14 @@ public class ConfigSourcesTest
FS.ensureEmpty(corp); FS.ensureEmpty(corp);
TestEnv.makeFile(corp,"start.ini", TestEnv.makeFile(corp,"start.ini",
// standard property // standard property
"jetty.port=9090", "jetty.http.port=9090",
// INTENTIONAL BAD Reference (duplicate) // INTENTIONAL BAD Reference (duplicate)
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
// Populate common // Populate common
TestEnv.makeFile(common,"start.ini", TestEnv.makeFile(common,"start.ini",
// standard property // standard property
"jetty.port=8080", "jetty.http.port=8080",
// reference to corp // reference to corp
"--include-jetty-dir=" + corp.getAbsolutePath()); "--include-jetty-dir=" + corp.getAbsolutePath());
@ -579,7 +579,7 @@ public class ConfigSourcesTest
File base = testdir.getFile("base"); File base = testdir.getFile("base");
FS.ensureEmpty(base); FS.ensureEmpty(base);
TestEnv.makeFile(base,"start.ini", // TestEnv.makeFile(base,"start.ini", //
"jetty.host=127.0.0.1",// "jetty.http.host=127.0.0.1",//
"--include-jetty-dir=" + common.getAbsolutePath()); "--include-jetty-dir=" + common.getAbsolutePath());
ConfigSources sources = new ConfigSources(); ConfigSources sources = new ConfigSources();

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

@ -51,29 +51,28 @@ LIB|${jetty.base}/lib/servlet-api-3.1.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.7.0_60
PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g # PROP|jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g
PROP|jetty.keystore=etc/keystore # PROP|jetty.sslConfig.keystorePath=etc/keystore
PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # PROP|jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
PROP|jetty.secure.port=8443 # PROP|jetty.httpConfig.securePort=8443
PROP|jetty.truststore=etc/keystore # PROP|jetty.sslConfig.truststorePath=etc/keystore
PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # PROP|jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
PROP|ssl.port=8443 # PROP|jetty.ssl.port=8443
PROP|ssl.timeout=30000 # PROP|jetty.ssl.idleTimeout=30000
# (these are the ones set by default from jetty.home modules) # (these are the ones set by default from jetty.home modules)
PROP|jetty.port=8080 PROP|jetty.alpn.debug=false
PROP|http.timeout=30000 PROP|jetty.http.port=8080
PROP|jetty.delayDispatchUntilContent=false PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.dump.start=false PROP|jetty.server.dumpAfterStart=false
PROP|jetty.dump.stop=false PROP|jetty.server.dumpBeforeStop=false
PROP|jetty.output.buffer.size=32768 PROP|jetty.httpConfig.outputBufferSize=32768
PROP|jetty.request.header.size=8192 PROP|jetty.httpConfig.requestHeaderSize=8192
PROP|jetty.response.header.size=8192 PROP|jetty.httpConfig.responseHeaderSize=8192
PROP|jetty.send.date.header=false PROP|jetty.httpConfig.sendDateHeader=false
PROP|jetty.send.server.version=true PROP|jetty.httpConfig.sendServerVersion=true
PROP|threads.max=200 PROP|jetty.threadPool.maxThreads=200
PROP|threads.min=10 PROP|jetty.threadPool.minThreads=10
PROP|threads.timeout=60000 PROP|jetty.threadPool.idleTimeout=60000
# JVM Args # JVM Args
JVM|-Xms1024m JVM|-Xms1024m
@ -89,5 +88,3 @@ FILE|lib/ext/
FILE|lib/alpn/ FILE|lib/alpn/
FILE|resources/ FILE|resources/
FILE|webapps/ FILE|webapps/

27
jetty-start/src/test/resources/assert-home-with-jvm.txt
View File

@ -47,21 +47,20 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.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|jetty.port=8080 # PROP|jetty.http.port=8080
# (these are the ones set by default from jetty.home modules) # (these are the ones set by default from jetty.home modules)
PROP|jetty.port=8080 PROP|jetty.http.port=8080
PROP|http.timeout=30000 PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.delayDispatchUntilContent=false PROP|jetty.server.dumpAfterStart=false
PROP|jetty.dump.start=false PROP|jetty.server.dumpBeforeStop=false
PROP|jetty.dump.stop=false PROP|jetty.httpConfig.outputBufferSize=32768
PROP|jetty.output.buffer.size=32768 PROP|jetty.httpConfig.requestHeaderSize=8192
PROP|jetty.request.header.size=8192 PROP|jetty.httpConfig.responseHeaderSize=8192
PROP|jetty.response.header.size=8192 PROP|jetty.httpConfig.sendDateHeader=false
PROP|jetty.send.date.header=false PROP|jetty.httpConfig.sendServerVersion=true
PROP|jetty.send.server.version=true PROP|jetty.threadPool.maxThreads=200
PROP|threads.max=200 PROP|jetty.threadPool.minThreads=10
PROP|threads.min=10 PROP|jetty.threadPool.idleTimeout=60000
PROP|threads.timeout=60000
# JVM Args # JVM Args
JVM|-Xms1024m JVM|-Xms1024m

25
jetty-start/src/test/resources/assert-home.txt
View File

@ -43,20 +43,19 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.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|jetty.port=9090 PROP|jetty.http.port=9090
# (these are the ones set by default from jetty.home modules) # (these are the ones set by default from jetty.home modules)
PROP|http.timeout=30000 PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.delayDispatchUntilContent=false PROP|jetty.server.dumpAfterStart=false
PROP|jetty.dump.start=false PROP|jetty.server.dumpBeforeStop=false
PROP|jetty.dump.stop=false PROP|jetty.httpConfig.outputBufferSize=32768
PROP|jetty.output.buffer.size=32768 PROP|jetty.httpConfig.requestHeaderSize=8192
PROP|jetty.request.header.size=8192 PROP|jetty.httpConfig.responseHeaderSize=8192
PROP|jetty.response.header.size=8192 PROP|jetty.httpConfig.sendDateHeader=false
PROP|jetty.send.date.header=false PROP|jetty.httpConfig.sendServerVersion=true
PROP|jetty.send.server.version=true PROP|jetty.threadPool.maxThreads=200
PROP|threads.max=200 PROP|jetty.threadPool.minThreads=10
PROP|threads.min=10 PROP|jetty.threadPool.idleTimeout=60000
PROP|threads.timeout=60000
# Files # Files
FILE|lib/ FILE|lib/

0
jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml → jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml
View File

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

@ -35,13 +35,19 @@ lib/
lib/alpn/ lib/alpn/
[ini-template] [ini-template]
# Configuration for ALPN # Overrides the order protocols are chosen by the server.
# alpn.protocols=h2-14,http/1.1 # The default order is that specified by the order of the
# alpn.defaultProtocol=http/1.1 # modules declared in start.ini.
# jetty.alpn.protocols=h2-16,http/1.1
# Specifies what protocol to use when negotiation fails.
# jetty.alpn.defaultProtocol=http/1.1
# ALPN debug logging on System.err
jetty.alpn.debug=false
[license] [license]
ALPN is a hosted at github under the GPL v2 with ClassPath Exception. ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package. ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package.
http://github.com/jetty-project/jetty-alpn http://github.com/jetty-project/jetty-alpn
http://openjdk.java.net/legal/gplv2+ce.html http://openjdk.java.net/legal/gplv2+ce.html

12
jetty-start/src/test/resources/dist-home/modules/debug.mod
View File

@ -1,12 +0,0 @@
#
# Debug module
#
[depend]
server
[files]
logs/
[xml]
etc/jetty-debug.xml

25
jetty-start/src/test/resources/dist-home/modules/debuglog.mod Normal file
View File

@ -0,0 +1,25 @@
#
# Debug module
#
[depend]
server
[files]
logs/
[xml]
etc/jetty-debug.xml
[ini-template]
## Logging directory (relative to $jetty.base)
# jetty.debuglog.dir=logs
## Whether to append to existing file
# jetty.debuglog.append=false
## How many days to retain old log files
# jetty.debuglog.retainDays=90
## Timezone of the log entries
# jetty.debuglog.timezone=GMT

10
jetty-start/src/test/resources/dist-home/modules/deploy.mod
View File

@ -15,7 +15,11 @@ webapps/
etc/jetty-deploy.xml etc/jetty-deploy.xml
[ini-template] [ini-template]
## DeployManager configuration # Monitored directory name (relative to jetty.base)
# Monitored Directory name (relative to jetty.base) # jetty.deploy.monitoredDir=webapps
# jetty.deploy.monitoredDirName=webapps
# Monitored directory scan period (seconds)
# jetty.deploy.scanInterval=1
# Whether to extract *.war files
# jetty.deploy.extractWars=true

2
jetty-start/src/test/resources/dist-home/modules/fcgi.mod
View File

@ -12,4 +12,4 @@ lib/fcgi/*.jar
[ini-template] [ini-template]
## For configuration of FastCGI contexts, see ## For configuration of FastCGI contexts, see
## TODO: documentation url here ## https://www.eclipse.org/jetty/documentation/current/fastcgi.html

15
jetty-start/src/test/resources/dist-home/modules/gzip.mod
View File

@ -10,9 +10,14 @@ server
etc/jetty-gzip.xml etc/jetty-gzip.xml
[ini-template] [ini-template]
### Gzip Handler ## Minimum content length after which gzip is enabled
# jetty.gzip.minGzipSize=2048
gzip.minGzipSize=2048 ## Check whether a file with *.gz extension exists
gzip.checkGzExists=false # jetty.gzip.checkGzExists=false
gzip.compressionLevel=-1
gzip.excludedUserAgent=.*MSIE.6\.0.* ## Gzip compression level (-1 for default)
# jetty.gzip.compressionLevel=-1
## User agents for which gzip is disabled
# jetty.gzip.excludedUserAgent=.*MSIE.6\.0.*

31
jetty-start/src/test/resources/dist-home/modules/http.mod
View File

@ -11,17 +11,26 @@ etc/jetty-http.xml
[ini-template] [ini-template]
### HTTP Connector Configuration ### HTTP Connector Configuration
## HTTP port to listen on ## Connector host/address to bind to
jetty.port=8080 # jetty.http.host=0.0.0.0
## HTTP idle timeout in milliseconds ## Connector port to listen on
http.timeout=30000 # jetty.http.port=80
## HTTP Socket.soLingerTime in seconds. (-1 to disable) ## Connector idle timeout in milliseconds
# http.soLingerTime=-1 # jetty.http.idleTimeout=30000
## Parameters to control the number and priority of acceptors and selectors ## Connector socket linger time in seconds (-1 to disable)
# http.selectors=1 # jetty.http.soLingerTime=-1
# http.acceptors=1
# http.selectorPriorityDelta=0 ## Number of acceptors (-1 picks default based on number of cores)
# http.acceptorPriorityDelta=0 # jetty.http.acceptors=-1
## Number of selectors (-1 picks default based on number of cores)
# jetty.http.selectors=-1
## ServerSocketChannel backlog (0 picks platform default)
# jetty.http.acceptorQueueSize=0
## Thread priority delta to give to acceptor threads
# jetty.http.acceptorPriorityDelta=0

6
jetty-start/src/test/resources/dist-home/modules/http2.mod
View File

@ -13,6 +13,8 @@ lib/http2/*.jar
etc/jetty-http2.xml etc/jetty-http2.xml
[ini-template] [ini-template]
## HTTP2 Configuration ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024
# http2.maxConcurrentStreams=1024 ## Initial stream send (server to client) window
# jetty.http2.initialStreamSendWindow=65535

14
jetty-start/src/test/resources/dist-home/modules/http2c.mod
View File

@ -1,5 +1,8 @@
# #
# HTTP2 Clear Text Support Module # HTTP2 Clear Text Support Module
# This module adds support for HTTP/2 clear text to the
# HTTP/1 clear text connector (defined in jetty-http.xml).
# The resulting connector will accept both HTTP/1 and HTTP/2 connections.
# #
[depend] [depend]
@ -12,11 +15,8 @@ lib/http2/*.jar
etc/jetty-http2c.xml etc/jetty-http2c.xml
[ini-template] [ini-template]
## HTTP2c Configuration ## Max number of concurrent streams per connection
# jetty.http2.maxConcurrentStreams=1024
# This module adds support for HTTP/2 clear text to the ## Initial stream send (server to client) window
# HTTP/1 clear text connector (defined in jetty-http.xml) # jetty.http2.initialStreamSendWindow=65535
# The resulting connector will accept both HTTP/1 and HTTP/2
# connections
# http2.maxConcurrentStreams=1024

5
jetty-start/src/test/resources/dist-home/modules/jaas.mod
View File

@ -12,5 +12,6 @@ lib/jetty-jaas-${jetty.version}.jar
etc/jetty-jaas.xml etc/jetty-jaas.xml
[ini-template] [ini-template]
## JAAS Configuration ## The file location (relative to $jetty.base) for the
jaas.login.conf=etc/login.conf ## JAAS "java.security.auth.login.config" system property
# jetty.jaas.login.conf=etc/login.conf

12
jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
View File

@ -9,10 +9,8 @@ jmx
etc/jetty-jmx-remote.xml etc/jetty-jmx-remote.xml
[ini-template] [ini-template]
## JMX Configuration ## The host/address to bind RMI to
## Enable for an open port accessible by remote machines # jetty.jmxremote.rmihost=localhost
# jetty.jmxrmihost=localhost
# jetty.jmxrmiport=1099 ## The port RMI listens to
## Strictly speaking you shouldn't need --exec to use this in most environments. # jetty.jmxremote.rmiport=1099
## If this isn't working, make sure you enable --exec as well
# -Dcom.sun.management.jmxremote

17
jetty-start/src/test/resources/dist-home/modules/logging.mod
View File

@ -23,9 +23,14 @@ resources/
# Configure jetty logging for java.util.logging # Configure jetty logging for java.util.logging
# -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
# STDERR / STDOUT Logging ## Logging directory (relative to jetty.base)
# Number of days to retain logs # jetty.logging.dir=logs
# jetty.log.retain=90
# Directory for logging output ## Whether to append to existing file
# Either a path relative to ${jetty.base} or an absolute path # jetty.logging.append=false
# jetty.logs=logs
## How many days to retain old log files
# jetty.logging.retainDays=90
## Timezone of the log timestamps
# jetty.logging.timezone=GMT

24
jetty-start/src/test/resources/dist-home/modules/lowresources.mod
View File

@ -9,10 +9,20 @@ server
etc/jetty-lowresources.xml etc/jetty-lowresources.xml
[ini-template] [ini-template]
## Low Resources Configuration ## Scan period to look for low resources (in milliseconds)
# lowresources.period=1050 # jetty.lowresources.period=1000
# lowresources.lowResourcesIdleTimeout=200
# lowresources.monitorThreads=true ## The idle timeout to apply to low resources (in milliseconds)
# lowresources.maxConnections=0 # jetty.lowresources.idleTimeout=1000
# lowresources.maxMemory=0
# lowresources.maxLowResourcesTime=5000 ## Whether to monitor ThreadPool threads for low resources
# jetty.lowresources.monitorThreads=true
## Max number of connections allowed before being in low resources mode
# jetty.lowresources.maxConnections=0
## Max memory allowed before being in low resources mode (in bytes)
# jetty.lowresources.maxMemory=0
## Max time a resource may stay in low resource mode before actions are taken (in milliseconds)
# jetty.lowresources.maxLowResourcesTime=5000

12
jetty-start/src/test/resources/dist-home/modules/proxy.mod
View File

@ -14,9 +14,9 @@ etc/jetty-proxy.xml
[ini-template] [ini-template]
## Proxy Configuration ## Proxy Configuration
#jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet # jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet
#jetty.proxy.servletMapping=/* # jetty.proxy.servletMapping=/*
#jetty.proxy.maxThreads=128 # jetty.proxy.maxThreads=128
#jetty.proxy.maxConnections=256 # jetty.proxy.maxConnections=256
#jetty.proxy.idleTimeout=30000 # jetty.proxy.idleTimeout=30000
#jetty.proxy.timeout=60000 # jetty.proxy.timeout=60000

34
jetty-start/src/test/resources/dist-home/modules/requestlog.mod
View File

@ -12,19 +12,23 @@ etc/jetty-requestlog.xml
logs/ logs/
[ini-template] [ini-template]
## Request Log Configuration ## File path (relative to $jetty.base)
# Filename for Request Log output (relative to jetty.base) # jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log
# requestlog.filename=/logs/yyyy_mm_dd.request.log
# Date format for rollovered files (uses SimpleDateFormat syntax)
# requestlog.filenameDateFormat=yyyy_MM_dd
# How many days to retain the logs
# requestlog.retain=90
# If an existing log with the same name is found, just append to it
# requestlog.append=true
# Use the extended log output
# requestlog.extended=true
# Log http cookie information as well
# requestlog.cookies=true
# Set the log output timezone
# requestlog.timezone=GMT
# Date format for rollovered files (uses SimpleDateFormat syntax)
# jetty.requestlog.filenameDateFormat=yyyy_MM_dd
# How many days to retain old log files
# jetty.requestlog.retainDays=90
## Whether to append to existing file
# jetty.requestlog.append=true
# Whether to use the extended log output
# jetty.requestlog.extended=true
# Whether to log http cookie information
# jetty.requestlog.cookies=true
## Timezone of the log entries
# jetty.requestlog.timezone=GMT

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