diff options
| author | Joakim Erdfelt | 2013-08-22 19:45:52 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2013-08-22 19:45:52 +0000 |
| commit | 5b2d9bc825826598b450db44c483acb1b69aee0c (patch) | |
| tree | 3a409595a9ea230a7d04b418e6a3c99a0631d565 /jetty-distribution/src | |
| parent | bddeb8cb775e6a61ed333d524f412d873e51732b (diff) | |
| download | org.eclipse.jetty.project-5b2d9bc825826598b450db44c483acb1b69aee0c.tar.gz org.eclipse.jetty.project-5b2d9bc825826598b450db44c483acb1b69aee0c.tar.xz org.eclipse.jetty.project-5b2d9bc825826598b450db44c483acb1b69aee0c.zip | |
More work to get jetty to start
Diffstat (limited to 'jetty-distribution/src')
29 files changed, 20 insertions, 312 deletions
diff --git a/jetty-distribution/src/main/resources/start.d/000-jvm.ini.disabled b/jetty-distribution/src/main/resources/start.d/000-jvm.ini.disabled deleted file mode 100644 index 939258b871..0000000000 --- a/jetty-distribution/src/main/resources/start.d/000-jvm.ini.disabled +++ /dev/null @@ -1,27 +0,0 @@ - -#=========================================================== -# Configure JVM arguments. -# If JVM args are include in an ini file then --exec is needed -# to start a new JVM from start.jar with the extra args. -# If you wish to avoid an extra JVM running, place JVM args -# on the normal command line and do not use --exec -# -# IF USED, THIS MODULE WILL INVOKE AN EXTRA JVM INSTANCE!! -#----------------------------------------------------------- ---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.d/000-npn.ini.disabled b/jetty-distribution/src/main/resources/start.d/000-npn.ini.disabled deleted file mode 100644 index b944d150cd..0000000000 --- a/jetty-distribution/src/main/resources/start.d/000-npn.ini.disabled +++ /dev/null @@ -1,17 +0,0 @@ -#=========================================================== -# 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 -# -#----------------------------------------------------------- - -DEFINE=npn -OPTION=npn - ---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.d/010-ext.ini b/jetty-distribution/src/main/resources/start.d/010-ext.ini deleted file mode 100644 index d4cb1eecf8..0000000000 --- a/jetty-distribution/src/main/resources/start.d/010-ext.ini +++ /dev/null @@ -1,3 +0,0 @@ -# Add libraries from lib/ext to the classpath - -OPTION=ext diff --git a/jetty-distribution/src/main/resources/start.d/010-jmx-remote.ini.disabled b/jetty-distribution/src/main/resources/start.d/010-jmx-remote.ini.disabled deleted file mode 100644 index 6ee25430de..0000000000 --- a/jetty-distribution/src/main/resources/start.d/010-jmx-remote.ini.disabled +++ /dev/null @@ -1,9 +0,0 @@ -#=========================================================== -# JMX Management -#----------------------------------------------------------- - -jetty.jmxrmihost=localhost -jetty.jmxrmiport=1099 - ---exec --Dcom.sun.management.jmxremote
\ No newline at end of file diff --git a/jetty-distribution/src/main/resources/start.d/010-resources.ini b/jetty-distribution/src/main/resources/start.d/010-resources.ini deleted file mode 100644 index b5fa4fdbd0..0000000000 --- a/jetty-distribution/src/main/resources/start.d/010-resources.ini +++ /dev/null @@ -1,3 +0,0 @@ -# Add the resources directory to the classpath - -OPTION=resources diff --git a/jetty-distribution/src/main/resources/start.d/100-jetty.ini b/jetty-distribution/src/main/resources/start.d/100-jetty.ini deleted file mode 100644 index dd40dedf80..0000000000 --- a/jetty-distribution/src/main/resources/start.d/100-jetty.ini +++ /dev/null @@ -1,21 +0,0 @@ - -#=========================================================== -# 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 -#----------------------------------------------------------- -DEFINE=jetty -OPTION=jetty - -threads.min=10 -threads.max=200 -threads.timeout=60000 -#jetty.host=myhost.com -jetty.dump.start=false -jetty.dump.stop=false -#jetty.logs=/var/log/jetty - -OPTION=Server -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 deleted file mode 100644 index 9422dda687..0000000000 --- a/jetty-distribution/src/main/resources/start.d/110-jmx.ini +++ /dev/null @@ -1,8 +0,0 @@ -#=========================================================== -# JMX Management -#----------------------------------------------------------- - -OPTION=jmx -DEPEND=jetty - -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 deleted file mode 100644 index 9a50221035..0000000000 --- a/jetty-distribution/src/main/resources/start.d/110-jsp.ini +++ /dev/null @@ -1,6 +0,0 @@ -#=========================================================== -# Java Server Pages -#----------------------------------------------------------- - -OPTION=jsp -DEPEND=jetty diff --git a/jetty-distribution/src/main/resources/start.d/110-logging.ini.disabled b/jetty-distribution/src/main/resources/start.d/110-logging.ini.disabled deleted file mode 100644 index cb98680ba9..0000000000 --- a/jetty-distribution/src/main/resources/start.d/110-logging.ini.disabled +++ /dev/null @@ -1,11 +0,0 @@ -#=========================================================== -# stderr/stdout logging. -# The following configuration will redirect stderr and stdout -# to file which is rolled over daily. -#----------------------------------------------------------- - -DEPEND=jetty - -jetty.log.retain=90 - -etc/jetty-logging.xml diff --git a/jetty-distribution/src/main/resources/start.d/110-setuid.ini.disabled b/jetty-distribution/src/main/resources/start.d/110-setuid.ini.disabled deleted file mode 100644 index dc1219a8c6..0000000000 --- a/jetty-distribution/src/main/resources/start.d/110-setuid.ini.disabled +++ /dev/null @@ -1,14 +0,0 @@ -#=========================================================== -# Enable SetUID -# The default user and group is 'jetty' and if you are -# starting as root you must change the run privledged to true -#----------------------------------------------------------- - -jetty.startServerAsPrivileged=false -jetty.username=jetty -jetty.groupname=jetty -jetty.umask=002 - -OPTION=setuid - -etc/jetty-setuid.xml diff --git a/jetty-distribution/src/main/resources/start.d/200-ssl.ini.disabled b/jetty-distribution/src/main/resources/start.d/200-ssl.ini.disabled deleted file mode 100644 index a0d0471577..0000000000 --- a/jetty-distribution/src/main/resources/start.d/200-ssl.ini.disabled +++ /dev/null @@ -1,18 +0,0 @@ -#=========================================================== -# SSL Context -# Create the keystore and trust store 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 - -DEPEND=jetty -DEFINE=ssl -OPTION=ssl - -etc/jetty-ssl.xml diff --git a/jetty-distribution/src/main/resources/start.d/200-websocket.ini b/jetty-distribution/src/main/resources/start.d/200-websocket.ini deleted file mode 100644 index 0cfd0f5a7f..0000000000 --- a/jetty-distribution/src/main/resources/start.d/200-websocket.ini +++ /dev/null @@ -1,6 +0,0 @@ -#=========================================================== -# WebSocket Support -#----------------------------------------------------------- - -DEPEND=jetty -OPTION=websocket diff --git a/jetty-distribution/src/main/resources/start.d/210-http.ini b/jetty-distribution/src/main/resources/start.d/210-http.ini deleted file mode 100644 index 062b907d95..0000000000 --- a/jetty-distribution/src/main/resources/start.d/210-http.ini +++ /dev/null @@ -1,12 +0,0 @@ -#=========================================================== -# HTTP Connector -#----------------------------------------------------------- - -jetty.port=8080 -http.timeout=30000 - -DEPEND=jetty -DEFINE=http -OPTION=http - -etc/jetty-http.xml diff --git a/jetty-distribution/src/main/resources/start.d/210-https.ini.disabled b/jetty-distribution/src/main/resources/start.d/210-https.ini.disabled deleted file mode 100644 index f518d15816..0000000000 --- a/jetty-distribution/src/main/resources/start.d/210-https.ini.disabled +++ /dev/null @@ -1,15 +0,0 @@ -#=========================================================== -# HTTPS Connector -# Must be used with jetty-ssl.xml -#----------------------------------------------------------- - -jetty.https.port=8443 - -EXCLUDE=spdy - -DEFINE=https -OPTION=https -DEPEND=ssl - -etc/jetty-https.xml - diff --git a/jetty-distribution/src/main/resources/start.d/210-spdy.ini.disabled b/jetty-distribution/src/main/resources/start.d/210-spdy.ini.disabled deleted file mode 100644 index d6f70c38d2..0000000000 --- a/jetty-distribution/src/main/resources/start.d/210-spdy.ini.disabled +++ /dev/null @@ -1,12 +0,0 @@ -#=========================================================== -# SPDY Connector -#----------------------------------------------------------- - -jetty.spdy.port=8443 - -EXCLUDE=https - -OPTION=spdy -DEPEND=npn,ssl - -etc/jetty-spdy.xml diff --git a/jetty-distribution/src/main/resources/start.d/300-jaas.ini.disabled b/jetty-distribution/src/main/resources/start.d/300-jaas.ini.disabled deleted file mode 100644 index 2d10e7f907..0000000000 --- a/jetty-distribution/src/main/resources/start.d/300-jaas.ini.disabled +++ /dev/null @@ -1,10 +0,0 @@ -# =========================================================== -# Enable JAAS -# ----------------------------------------------------------- - -jaas.login.conf=etc/login.conf - -OPTION=jaas -EXCLUDE=demo - -etc/jetty-jaas.xml diff --git a/jetty-distribution/src/main/resources/start.d/300-jndi.ini.disabled b/jetty-distribution/src/main/resources/start.d/300-jndi.ini.disabled deleted file mode 100644 index f07ab9f5b7..0000000000 --- a/jetty-distribution/src/main/resources/start.d/300-jndi.ini.disabled +++ /dev/null @@ -1,6 +0,0 @@ -# =========================================================== -# Enable JNDI -# ----------------------------------------------------------- - -OPTION=jndi -EXCLUDE=demo diff --git a/jetty-distribution/src/main/resources/start.d/300-plus.ini b/jetty-distribution/src/main/resources/start.d/300-plus.ini deleted file mode 100644 index f446f49773..0000000000 --- a/jetty-distribution/src/main/resources/start.d/300-plus.ini +++ /dev/null @@ -1,6 +0,0 @@ -# =========================================================== -# Enable additional webapp environment configurators -# ----------------------------------------------------------- - -OPTION=plus -etc/jetty-plus.xml diff --git a/jetty-distribution/src/main/resources/start.d/300-requestlog.ini.disabled b/jetty-distribution/src/main/resources/start.d/300-requestlog.ini.disabled deleted file mode 100644 index f4b73711f1..0000000000 --- a/jetty-distribution/src/main/resources/start.d/300-requestlog.ini.disabled +++ /dev/null @@ -1,11 +0,0 @@ - -#=========================================================== -# 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
\ No newline at end of file diff --git a/jetty-distribution/src/main/resources/start.d/310-annotations.ini b/jetty-distribution/src/main/resources/start.d/310-annotations.ini deleted file mode 100644 index 8e0d9639de..0000000000 --- a/jetty-distribution/src/main/resources/start.d/310-annotations.ini +++ /dev/null @@ -1,9 +0,0 @@ -# =========================================================== -# Enable servlet 3.1 annotations -# ----------------------------------------------------------- - -OPTION=annotations -DEPEND=plus - -etc/jetty-annotations.xml - diff --git a/jetty-distribution/src/main/resources/start.d/320-websocket-annotations.ini b/jetty-distribution/src/main/resources/start.d/320-websocket-annotations.ini deleted file mode 100644 index 5ceac0b69a..0000000000 --- a/jetty-distribution/src/main/resources/start.d/320-websocket-annotations.ini +++ /dev/null @@ -1,9 +0,0 @@ -#=========================================================== -# WebSocket Annotations Support -#----------------------------------------------------------- - -DEFINE=websocket-annotations -OPTION=websocket-annotations -DEPEND=websocket - -etc/jetty-websockets.xml diff --git a/jetty-distribution/src/main/resources/start.d/400-debug.ini.disabled b/jetty-distribution/src/main/resources/start.d/400-debug.ini.disabled deleted file mode 100644 index d2f69bb810..0000000000 --- a/jetty-distribution/src/main/resources/start.d/400-debug.ini.disabled +++ /dev/null @@ -1 +0,0 @@ -etc/jetty-debug.xml diff --git a/jetty-distribution/src/main/resources/start.d/400-ipaccess.ini.disabled b/jetty-distribution/src/main/resources/start.d/400-ipaccess.ini.disabled deleted file mode 100644 index d272540be4..0000000000 --- a/jetty-distribution/src/main/resources/start.d/400-ipaccess.ini.disabled +++ /dev/null @@ -1 +0,0 @@ -etc/jetty-ipaccess.xml diff --git a/jetty-distribution/src/main/resources/start.d/400-lowresources.ini.disabled b/jetty-distribution/src/main/resources/start.d/400-lowresources.ini.disabled deleted file mode 100644 index 5df05ebb6a..0000000000 --- a/jetty-distribution/src/main/resources/start.d/400-lowresources.ini.disabled +++ /dev/null @@ -1,13 +0,0 @@ -#=========================================================== -# Low resource management -#----------------------------------------------------------- - -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.d/400-rewrite.ini.disabled b/jetty-distribution/src/main/resources/start.d/400-rewrite.ini.disabled deleted file mode 100644 index 0af3478203..0000000000 --- a/jetty-distribution/src/main/resources/start.d/400-rewrite.ini.disabled +++ /dev/null @@ -1,7 +0,0 @@ -# =========================================================== -# Enable rewrite handler -# ----------------------------------------------------------- - -OPTION=rewrite -EXCLUDE=demo -etc/jetty-rewrite.xml diff --git a/jetty-distribution/src/main/resources/start.d/400-stats.ini.disabled b/jetty-distribution/src/main/resources/start.d/400-stats.ini.disabled deleted file mode 100644 index d01ddfc30b..0000000000 --- a/jetty-distribution/src/main/resources/start.d/400-stats.ini.disabled +++ /dev/null @@ -1 +0,0 @@ -etc/jetty-stats.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 deleted file mode 100644 index b8f9a40a96..0000000000 --- a/jetty-distribution/src/main/resources/start.d/500-deploy.ini +++ /dev/null @@ -1,8 +0,0 @@ -#=========================================================== -# Webapplication Deployer -#----------------------------------------------------------- - -DEFINE=deploy -OPTION=deploy -DEPEND=jetty -etc/jetty-deploy.xml diff --git a/jetty-distribution/src/main/resources/start.d/900-demo.ini b/jetty-distribution/src/main/resources/start.d/demo.ini index 7f053aacf9..037e743f2c 100644 --- a/jetty-distribution/src/main/resources/start.d/900-demo.ini +++ b/jetty-distribution/src/main/resources/start.d/demo.ini @@ -1,4 +1,3 @@ - # =========================================================== # Enable the demonstration web applications # @@ -6,22 +5,12 @@ # the start.d directory or rename it to not end with ".ini" # =========================================================== - - -# The following options are explicitly configured for the demo -# in this file. Thus they cannot be used with the normal -# activation of them +MODULES=jaas,jndi,rewrite,client,annotations,websocket jaas.login.conf=webapps.demo/test-jaas.d/login.conf -EXCLUDE=jaas,jndi,rewrite -OPTION=jaas,jndi,rewrite,client - -etc/jetty-rewrite.xml -etc/jetty-jaas.xml # Activate the demo options and configurations -OPTION=jndi.demo +MODULES=jndi.demo etc/jetty-demo.xml etc/test-realm.xml -DEPEND=ext,resources,http,plus,annotations,websocket-annotations,deploy diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini index 3d7646db81..78d063a2a9 100644 --- a/jetty-distribution/src/main/resources/start.ini +++ b/jetty-distribution/src/main/resources/start.ini @@ -57,11 +57,9 @@ # -XX:+PrintTenuringDistribution # -XX:+PrintCommandLineFlags # -XX:+DisableExplicitGC - # -Dorg.apache.jasper.compiler.disablejsr199=true - #=========================================================== # Default Server Options # Use the core server jars with websocket on the classpath @@ -69,7 +67,6 @@ # 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 @@ -77,33 +74,30 @@ threads.timeout=60000 jetty.dump.start=false jetty.dump.stop=false -etc/jetty.xml - #=========================================================== # JMX Management # To enable remote JMX access uncomment jmxremote and # enable --exec #----------------------------------------------------------- -OPTIONS=jmx +MODULE=jmx # jetty.jmxrmihost=localhost # jetty.jmxrmiport=1099 # -Dcom.sun.management.jmxremote -etc/jetty-jmx.xml #=========================================================== # Java Server Pages #----------------------------------------------------------- -OPTIONS=jsp +MODULE=jsp #=========================================================== # Request logger # Will add a handler to log all HTTP requests to a standard # request log format file. #----------------------------------------------------------- +# MODULE=requestlog # requestlog.retain=90 # requestlog.append=true # requestlog.extended=true -# etc/jetty-requestlog.xml #=========================================================== @@ -111,29 +105,27 @@ OPTIONS=jsp # The following configuration will redirect stderr and stdout # to file which is rolled over daily. #----------------------------------------------------------- +# MODULE=logging # jetty.log.retain=90 -# etc/jetty-logging.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 +# MODULE=setuid # jetty.startServerAsPrivileged=false # jetty.username=jetty # jetty.groupname=jetty # jetty.umask=002 -# etc/jetty-setuid.xml #=========================================================== # HTTP Connector #----------------------------------------------------------- +MODULE=http jetty.port=8080 http.timeout=30000 -etc/jetty-http.xml #=========================================================== @@ -147,15 +139,14 @@ etc/jetty-http.xml # jetty.truststore=etc/keystore # jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 # jetty.secure.port=8443 -# etc/jetty-ssl.xml #=========================================================== # HTTPS Connector # Must be used with jetty-ssl.xml #----------------------------------------------------------- +MODULE=https # jetty.https.port=8443 -# etc/jetty-https.xml #=========================================================== @@ -176,62 +167,54 @@ etc/jetty-http.xml # SPDY Connector # Requires SSL Context and NPN from above #----------------------------------------------------------- -# OPTIONS=spdy +# MODULE=spdy # jetty.spdy.port=8443 -# etc/jetty-spdy.xml #=========================================================== # Webapplication Deployer #----------------------------------------------------------- -etc/jetty-deploy.xml - +MODULE=deploy # =========================================================== # Enable JAAS # ----------------------------------------------------------- -# OPTIONS=jaas +# MODULE=jaas # jaas.login.conf=etc/login.conf -# etc/jetty-jaas.xml # =========================================================== # Enable JNDI # ----------------------------------------------------------- -# OPTIONS=jndi +# MODULE=jndi # =========================================================== # Enable additional webapp environment configurators # ----------------------------------------------------------- -# OPTIONS=plus -# etc/jetty-plus.xml +# MODULE=plus # =========================================================== # Enable servlet 3.1 annotations # ----------------------------------------------------------- -# OPTIONS=annotations -# etc/jetty-annotations.xml +# MODULE=annotations #=========================================================== # Other server features #----------------------------------------------------------- -# etc/jetty-debug.xml -# etc/jetty-ipaccess.xml -# etc/jetty-stats.xml +# MODULE=debug +# MODULE=ipaccess +# MODULE=stats #=========================================================== # Low resource managment #----------------------------------------------------------- +# MODULE=lowresources # lowresources.period=1050 # lowresources.lowResourcesIdleTimeout=200 # lowresources.monitorThreads=true # lowresources.maxConnections=0 # lowresources.maxMemory=0 # lowresources.maxLowResourcesTime=5000 -# etc/jetty-lowresources.xml - -#=========================================================== -# The start.d directory contains the active start.ini fragments -start.d/ +MODULES=webapp |