diff options
| author | Greg Wilkins | 2013-04-26 03:53:28 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2013-04-26 03:53:28 +0000 |
| commit | 9558d7e815ac9815bdfbb8820177384a8d5e16eb (patch) | |
| tree | f0c738f8f3c6097dee8beb6872e5f9c99f2e7260 /jetty-distribution/src | |
| parent | dbedbfa67e2ccfb41cb41de6f6bb65961a5ea315 (diff) | |
| download | org.eclipse.jetty.project-9558d7e815ac9815bdfbb8820177384a8d5e16eb.tar.gz org.eclipse.jetty.project-9558d7e815ac9815bdfbb8820177384a8d5e16eb.tar.xz org.eclipse.jetty.project-9558d7e815ac9815bdfbb8820177384a8d5e16eb.zip | |
modular start.ini files and --download start option
Diffstat (limited to 'jetty-distribution/src')
27 files changed, 167 insertions, 195 deletions
diff --git a/jetty-distribution/src/main/resources/start.available/000-jvm.ini b/jetty-distribution/src/main/resources/start.available/000-jvm.ini new file mode 100644 index 0000000000..1f5e32946c --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/000-jvm.ini @@ -0,0 +1,21 @@ +#=========================================================== +# Configure JVM arguments. +#----------------------------------------------------------- +--exec + +-Xmx2000m +-Xmn512m +-XX:+UseConcMarkSweepGC +-XX:ParallelCMSThreads=2 +-XX:+CMSClassUnloadingEnabled +-XX:+UseCMSCompactAtFullCollection +-XX:CMSInitiatingOccupancyFraction=80 +# -verbose:gc +# -XX:+PrintGCDateStamps +# -XX:+PrintGCTimeStamps +# -XX:+PrintGCDetails +# -XX:+PrintTenuringDistribution +# -XX:+PrintCommandLineFlags +# -XX:+DisableExplicitGC + +# -Dorg.apache.jasper.compiler.disablejsr199=true diff --git a/jetty-distribution/src/main/resources/start.available/110-logging.ini b/jetty-distribution/src/main/resources/start.available/110-logging.ini new file mode 100644 index 0000000000..c8dfa64da1 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/110-logging.ini @@ -0,0 +1,7 @@ +#=========================================================== +# Server logging. +# The following configuration will redirect stderr and stdout +# to file which is rolled over daily. +#----------------------------------------------------------- +jetty.log.retain=90 +etc/jetty-logging.xml diff --git a/jetty-distribution/src/main/resources/start.available/110-setuid.ini b/jetty-distribution/src/main/resources/start.available/110-setuid.ini new file mode 100644 index 0000000000..97b1682ced --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/110-setuid.ini @@ -0,0 +1,13 @@ +#=========================================================== +# Enable SetUID +# The default user and group is 'jetty' and if you are +# starting as root you must change the run privledged to true +#----------------------------------------------------------- +OPTIONS=setuid +jetty.startServerAsPrivileged=false +jetty.username=jetty +jetty.groupname=jetty +jetty.umask=002 + +etc/jetty-setuid.xml + diff --git a/jetty-distribution/src/main/resources/start.available/200-npn.ini b/jetty-distribution/src/main/resources/start.available/200-npn.ini new file mode 100644 index 0000000000..0ca98db0fd --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/200-npn.ini @@ -0,0 +1,12 @@ +#=========================================================== +# NPN Next Protocol Negotiation +# +# The SPDY and HTTP/2.0 connectors require NPN. The jar for +# NPN cannot be downloaded from eclipse. So the --download +# option is used to install the NPN jar if it does not already +# exist +# +#----------------------------------------------------------- +--exec +--download=http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-distribution/src/main/resources/start.available/200-ssl.ini b/jetty-distribution/src/main/resources/start.available/200-ssl.ini new file mode 100644 index 0000000000..6a56dd54e6 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/200-ssl.ini @@ -0,0 +1,12 @@ +#=========================================================== +# SSL Context +# For use by HTTPS and SPDY +#----------------------------------------------------------- +jetty.keystore=etc/keystore +jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +jetty.truststore=etc/keystore +jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.secure.port=8443 + +etc/jetty-ssl.xml diff --git a/jetty-distribution/src/main/resources/start.available/210-https.ini b/jetty-distribution/src/main/resources/start.available/210-https.ini new file mode 100644 index 0000000000..42897c42da --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/210-https.ini @@ -0,0 +1,6 @@ +#=========================================================== +# HTTPS Connector +# Must be used with 200-ssl.ini +#----------------------------------------------------------- +jetty.https.port=8443 +etc/jetty-https.xml diff --git a/jetty-distribution/src/main/resources/start.available/210-spdy.ini b/jetty-distribution/src/main/resources/start.available/210-spdy.ini new file mode 100644 index 0000000000..0d0eac4691 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/210-spdy.ini @@ -0,0 +1,9 @@ +#=========================================================== +# SPDY Connector +# Must be used with 200-ssl.ini and 200-npn.ini +#----------------------------------------------------------- +OPTIONS=spdy +jetty.spdy.port=8443 + +etc/jetty-spdy.xml + diff --git a/jetty-distribution/src/main/resources/start.available/300-plus.ini b/jetty-distribution/src/main/resources/start.available/300-plus.ini new file mode 100644 index 0000000000..021c48a784 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/300-plus.ini @@ -0,0 +1,8 @@ +#=========================================================== +# Annotations JNDI JAAS processing +#----------------------------------------------------------- +OPTIONS=plus +etc/jetty-plus.xml +OPTIONS=annotations +etc/jetty-annotations.xml + diff --git a/jetty-distribution/src/main/resources/start.available/300-requestlog.ini b/jetty-distribution/src/main/resources/start.available/300-requestlog.ini new file mode 100644 index 0000000000..195d2b9468 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/300-requestlog.ini @@ -0,0 +1,9 @@ +#=========================================================== +# Request logger +# Will add a handler to log all HTTP requests to a standard +# request log format file. +#----------------------------------------------------------- +requestlog.retain=90 +requestlog.append=true +requestlog.extended=true +etc/jetty-requestlog.xml diff --git a/jetty-distribution/src/main/resources/start.available/400-debug.ini b/jetty-distribution/src/main/resources/start.available/400-debug.ini new file mode 100644 index 0000000000..d2f69bb810 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/400-debug.ini @@ -0,0 +1 @@ +etc/jetty-debug.xml diff --git a/jetty-distribution/src/main/resources/start.available/400-ipaccess.ini b/jetty-distribution/src/main/resources/start.available/400-ipaccess.ini new file mode 100644 index 0000000000..d272540be4 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/400-ipaccess.ini @@ -0,0 +1 @@ +etc/jetty-ipaccess.xml diff --git a/jetty-distribution/src/main/resources/start.available/400-lowresources.ini b/jetty-distribution/src/main/resources/start.available/400-lowresources.ini new file mode 100644 index 0000000000..c6847804e8 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/400-lowresources.ini @@ -0,0 +1,11 @@ +#=========================================================== +#----------------------------------------------------------- + +lowresources.period=1050 +lowresources.lowResourcesIdleTimeout=200 +lowresources.monitorThreads=true +lowresources.maxConnections=0 +lowresources.maxMemory=0 +lowresources.maxLowResourcesTime=5000 +etc/jetty-lowresources.xml + diff --git a/jetty-distribution/src/main/resources/start.available/400-stats.ini b/jetty-distribution/src/main/resources/start.available/400-stats.ini new file mode 100644 index 0000000000..1f09e7d70a --- /dev/null +++ b/jetty-distribution/src/main/resources/start.available/400-stats.ini @@ -0,0 +1,4 @@ +#=========================================================== +#----------------------------------------------------------- +etc/jetty-stats.xml + diff --git a/jetty-distribution/src/main/resources/start.d/100-jetty.ini b/jetty-distribution/src/main/resources/start.d/100-jetty.ini new file mode 100644 index 0000000000..cbd5f75a20 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.d/100-jetty.ini @@ -0,0 +1,16 @@ +#=========================================================== +# Default Server Options +# Use the core server jars with websocket on the classpath +# Add the contents of the resources directory to the classpath +# Add jars discovered in lib/ext to the classpath +# Include the core jetty configuration file +#----------------------------------------------------------- +OPTIONS=Server,websocket,resources,ext +threads.min=10 +threads.max=200 +threads.timeout=60000 +#jetty.host=myhost.com +jetty.dump.start=false +jetty.dump.stop=false + +etc/jetty.xml diff --git a/jetty-distribution/src/main/resources/start.d/110-jmx.ini b/jetty-distribution/src/main/resources/start.d/110-jmx.ini new file mode 100644 index 0000000000..ce176332b2 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.d/110-jmx.ini @@ -0,0 +1,10 @@ +#=========================================================== +# JMX Management +# To enable remote JMX access uncomment jmxremote and +# enable --exec +#----------------------------------------------------------- +OPTIONS=jmx +# jetty.jmxrmihost=localhost +# jetty.jmxrmiport=1099 +# -Dcom.sun.management.jmxremote +etc/jetty-jmx.xml diff --git a/jetty-distribution/src/main/resources/start.d/110-jsp.ini b/jetty-distribution/src/main/resources/start.d/110-jsp.ini new file mode 100644 index 0000000000..525fb6214b --- /dev/null +++ b/jetty-distribution/src/main/resources/start.d/110-jsp.ini @@ -0,0 +1,5 @@ +#=========================================================== +# Java Server Pages +#----------------------------------------------------------- +OPTIONS=jsp + diff --git a/jetty-distribution/src/main/resources/start.d/210-http.ini b/jetty-distribution/src/main/resources/start.d/210-http.ini new file mode 100644 index 0000000000..ee8133306c --- /dev/null +++ b/jetty-distribution/src/main/resources/start.d/210-http.ini @@ -0,0 +1,6 @@ +#=========================================================== +# HTTP Connector +#----------------------------------------------------------- +jetty.port=8080 +http.timeout=30000 +etc/jetty-http.xml diff --git a/jetty-distribution/src/main/resources/start.d/500-deploy.ini b/jetty-distribution/src/main/resources/start.d/500-deploy.ini new file mode 100644 index 0000000000..11e7f03a14 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.d/500-deploy.ini @@ -0,0 +1,4 @@ +#=========================================================== +# Webapplication Deployer +#----------------------------------------------------------- +etc/jetty-deploy.xml diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini index 382010d19b..bc18db8dcc 100644 --- a/jetty-distribution/src/main/resources/start.ini +++ b/jetty-distribution/src/main/resources/start.ini @@ -1,5 +1,6 @@ #=========================================================== # Jetty start.jar arguments +# # The contents of this file, together with the start.ini # fragments found in start.d directory are used to build # the classpath and command line on a call to @@ -23,199 +24,8 @@ # #=========================================================== -#=========================================================== -# The --exec option should be used if any of the JVM options -# in this file are uncommented (eg -D* or -X*). Because a -# JVM cannot change it's own options, the --exec flag causes -# start.jar to fork a new JVM with the requested arguments. -# -# Alternately, a command line may be generated by running -# -# java -jar start.jar --exec-print -# -# and the results executed to start the jetty server. -# For example --exec can be avoided if jetty is started on unix with -# -# eval $(java -jar start.jar --exec-print) -# -#----------------------------------------------------------- -# --exec -#=========================================================== - -#=========================================================== -# Configure Properties. -# The properties defined here may be used by the -# <Property name="myproperty"/> element in the XML files -# passed to start.jar. -# Alternately a file ending with ".properties" can be -# added that will include multiple properties. -# Properties, unlike SystemProperties, do not need --exec -# to be specified. -#----------------------------------------------------------- -# jetty.home=. -# jetty.logs=./logs -# jetty.host=0.0.0.0 -#=========================================================== - - -#=========================================================== -# Configure JVM arguments. -# Must be used with --exec or --exec-print -#----------------------------------------------------------- -# -Dorg.apache.jasper.compiler.disablejsr199=true -# -Xmx2000m -# -Xmn512m -# -verbose:gc -# -XX:+PrintGCDateStamps -# -XX:+PrintGCTimeStamps -# -XX:+PrintGCDetails -# -XX:+PrintTenuringDistribution -# -XX:+PrintCommandLineFlags -# -XX:+DisableExplicitGC -# -XX:+UseConcMarkSweepGC -# -XX:ParallelCMSThreads=2 -# -XX:+CMSClassUnloadingEnabled -# -XX:+UseCMSCompactAtFullCollection -# -XX:CMSInitiatingOccupancyFraction=80 -#=========================================================== - -#=========================================================== -# Default Server Options -# Use the core server jars with websocket on the classpath -# Add the contents of the resources directory to the classpath -# Add jars discovered in lib/ext to the classpath -# Include the core jetty configuration file -#----------------------------------------------------------- -OPTIONS=Server,websocket,resources,ext -etc/jetty.xml -#=========================================================== - -#=========================================================== -# Enable SetUID -# The default user and group is 'jetty' and if you are -# starting as root you must change the run privledged to true -#----------------------------------------------------------- -# OPTIONS=setuid -# etc/jetty-setuid.xml -# jetty.startServerAsPrivileged=false -# jetty.username=jetty -# jetty.groupname=jetty -# jetty.umask=002 -#=========================================================== - -#=========================================================== -# Server logging. -# The following configuration will redirect stderr and stdout -# to file which is rolled over daily. -#----------------------------------------------------------- -# etc/jetty-logging.xml -#=========================================================== - -#=========================================================== -# JMX Management -# To enable remote JMX access uncomment jmxremote and -# enable --exec or use --exec-print (see above) -#----------------------------------------------------------- -OPTIONS=jmx -# jetty.jmxrmihost=localhost -# jetty.jmxrmiport=1099 -# -Dcom.sun.management.jmxremote -etc/jetty-jmx.xml -#=========================================================== - -#=========================================================== -# Java Server Pages -#----------------------------------------------------------- -OPTIONS=jsp -#=========================================================== - - -#=========================================================== -# Annotations JNDI JAAS processing -#----------------------------------------------------------- -# OPTIONS=plus -# etc/jetty-plus.xml -# OPTIONS=annotations -# etc/jetty-annotations.xml -#=========================================================== - -#=========================================================== -# HTTP Connector -#----------------------------------------------------------- -# jetty.port=8080 -etc/jetty-http.xml -#=========================================================== - -#=========================================================== -# SSL Context -# For use by HTTPS and SPDY -#----------------------------------------------------------- -# jetty.keystore=etc/keystore -# jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -# jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g -# jetty.truststore=etc/keystore -# jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -# jetty.secure.port=8443 -# etc/jetty-ssl.xml -#=========================================================== - -#=========================================================== -# HTTPS Connector -#----------------------------------------------------------- -# jetty.https.port=8443 -# etc/jetty-https.xml -#=========================================================== - -#=========================================================== -# SPDY Connector -# -# SPDY requires the NPN jar which must be separately downloaded: -# -# http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar -# -# Which should be saved in lib/npn-boot-1.1.5.v20130313.jar -# -# To include the NPN jar on the boot path, you must either: -# -# a) enable --exec above and uncomment the -Xbootclass line -# below -# -# b) Add -Xbootclasspath/p:lib/npn-boot-1.1.5.v20130313.jar -# to the command line when running jetty. -# -#----------------------------------------------------------- -# OPTIONS=spdy -# -Xbootclasspath/p:lib/npn-boot-1.1.5.v20130313.jar -# jetty.spdy.port=8443 -# etc/jetty-spdy.xml -#=========================================================== - -#=========================================================== -# Webapplication Deployer -#----------------------------------------------------------- -etc/jetty-deploy.xml -#=========================================================== - -#=========================================================== -# Request logger -# Will add a handler to log all HTTP requests to a standard -# request log format file. -#----------------------------------------------------------- -etc/jetty-requestlog.xml -#=========================================================== - -#=========================================================== -# Additional configurations -# See headers of individual files for explanations -#----------------------------------------------------------- -# etc/jetty-stats.xml -# etc/jetty-debug.xml -# etc/jetty-ipaccess.xml -# etc/jetty-lowresources.xml -#=========================================================== - -#=========================================================== -# Lookup additional ini files in start.d -#----------------------------------------------------------- +# The start.d directory contains the active start.ini fragments start.d/ -#=========================================================== + +# More start.ini fragments are in start.available and may be +# enabled by copying or linking to start.d diff --git a/jetty-distribution/src/main/resources/webapps.demo/README.TXT b/jetty-distribution/src/main/resources/webapps.demo/README.TXT new file mode 100644 index 0000000000..ec2bea255c --- /dev/null +++ b/jetty-distribution/src/main/resources/webapps.demo/README.TXT @@ -0,0 +1,7 @@ + +This directory is scanned by the demo WebAppDeployer provider +created in the etc/jetty-demo.xml file and enabled by the +start.d/900-demo.ini file. + +For normal deployment, use the webapps directory. + diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/images/jetty-header.jpg b/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/jetty-header.jpg Binary files differindex f40c3644cc..f40c3644cc 100644 --- a/jetty-distribution/src/main/resources/webapps/ROOT/images/jetty-header.jpg +++ b/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/jetty-header.jpg diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/images/webtide_logo.jpg b/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/webtide_logo.jpg Binary files differindex b949919f08..b949919f08 100644 --- a/jetty-distribution/src/main/resources/webapps/ROOT/images/webtide_logo.jpg +++ b/jetty-distribution/src/main/resources/webapps.demo/ROOT/images/webtide_logo.jpg diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/index.html b/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html index 826974f243..826974f243 100644 --- a/jetty-distribution/src/main/resources/webapps/ROOT/index.html +++ b/jetty-distribution/src/main/resources/webapps.demo/ROOT/index.html diff --git a/jetty-distribution/src/main/resources/webapps/ROOT/jetty.css b/jetty-distribution/src/main/resources/webapps.demo/ROOT/jetty.css index 90d281a7bf..90d281a7bf 100644 --- a/jetty-distribution/src/main/resources/webapps/ROOT/jetty.css +++ b/jetty-distribution/src/main/resources/webapps.demo/ROOT/jetty.css diff --git a/jetty-distribution/src/main/resources/webapps/example-moved.xml b/jetty-distribution/src/main/resources/webapps.demo/example-moved.xml index 4b176a4467..4b176a4467 100644 --- a/jetty-distribution/src/main/resources/webapps/example-moved.xml +++ b/jetty-distribution/src/main/resources/webapps.demo/example-moved.xml diff --git a/jetty-distribution/src/main/resources/webapps/javadoc.xml b/jetty-distribution/src/main/resources/webapps.demo/javadoc.xml index df854d27ac..df854d27ac 100644 --- a/jetty-distribution/src/main/resources/webapps/javadoc.xml +++ b/jetty-distribution/src/main/resources/webapps.demo/javadoc.xml diff --git a/jetty-distribution/src/main/resources/webapps/.donotdelete b/jetty-distribution/src/main/resources/webapps/.donotdelete deleted file mode 100644 index e69de29bb2..0000000000 --- a/jetty-distribution/src/main/resources/webapps/.donotdelete +++ /dev/null |
