414635 Modular start.d and jetty.base property

dependencies
This commit is contained in:
Greg Wilkins 2013-08-20 17:04:20 +10:00
parent 26fbd41376
commit 9bb6d91742
15 changed files with 28 additions and 45 deletions

View File

@ -6,6 +6,8 @@
# 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

View File

@ -3,5 +3,6 @@
#-----------------------------------------------------------
OPTION=jmx
DEPEND=jetty
etc/jetty-jmx.xml
etc/jetty-jmx.xml

View File

@ -2,4 +2,5 @@
# Java Server Pages
#-----------------------------------------------------------
OPTION=jsp
OPTION=jsp
DEPEND=jetty

View File

@ -4,6 +4,8 @@
# to file which is rolled over daily.
#-----------------------------------------------------------
DEPEND=jetty
jetty.log.retain=90
etc/jetty-logging.xml
etc/jetty-logging.xml

View File

@ -11,4 +11,4 @@ jetty.umask=002
OPTION=setuid
etc/jetty-setuid.xml
etc/jetty-setuid.xml

View File

@ -11,6 +11,7 @@ jetty.truststore=etc/keystore
jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
jetty.secure.port=8443
DEPEND=jetty
DEFINE=ssl
OPTION=ssl

View File

@ -2,4 +2,5 @@
# WebSocket Support
#-----------------------------------------------------------
DEPEND=jetty
OPTION=websocket

View File

@ -5,7 +5,8 @@
jetty.port=8080
http.timeout=30000
DEPEND=jetty
DEFINE=http
OPTION=http
etc/jetty-http.xml
etc/jetty-http.xml

View File

@ -5,5 +5,6 @@
jaas.login.conf=etc/login.conf
OPTION=jaas
EXCLUDE=demo
etc/jetty-jaas.xml
etc/jetty-jaas.xml

View File

@ -2,4 +2,5 @@
# Enable JNDI
# -----------------------------------------------------------
OPTION=jndi
OPTION=jndi
EXCLUDE=demo

View File

@ -2,6 +2,8 @@
# WebSocket Annotations Support
#-----------------------------------------------------------
DEFINE=websocket-annotations
OPTION=websocket-annotations
DEPEND=websocket
etc/jetty-websockets.xml

View File

@ -3,4 +3,5 @@
# -----------------------------------------------------------
OPTION=rewrite
EXCLUDE=demo
etc/jetty-rewrite.xml

View File

@ -2,4 +2,7 @@
# Webapplication Deployer
#-----------------------------------------------------------
etc/jetty-deploy.xml
DEFINE=deploy
OPTION=deploy
DEPEND=jetty
etc/jetty-deploy.xml

View File

@ -12,7 +12,7 @@
# in this file. Thus they cannot be used with the normal
# activation of them
jaas.login.conf=webapps.demo/test-jaas.d/login.conf
EXCLUDE=jaas,jndi,rewrite,client
EXCLUDE=jaas,jndi,rewrite
OPTION=jaas,jndi,rewrite,client
etc/jetty-rewrite.xml
@ -23,3 +23,5 @@ OPTION=jndi.demo
etc/jetty-demo.xml
etc/test-realm.xml
DEPEND=ext,resources,http,plus,annotations,websocket-annotations,deploy

View File

@ -1,36 +0,0 @@
#===========================================================
# 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
# java -jar start.jar [arg...]
#
# Use the following command to see more options
# java -jar start.jar --help
#
# Each line in this file is prepended to the command line
# as arguments, which may be either:
# + A property like: name=value
# + Activation of an option: OPTION=option
# + The declaration of a new option: DEFINE=option
# + An option dependency: DEPEND=option,option
# + An option exclusion: EXCLUDE=option,option
# + A file of properties like: /etc/myjetty.properties
# + An XML configuration file like: etc/jetty-feature.xml
# + A start.jar option like: --dry-run
#
# If --exec or --exec-print are used, then this file may also
# contain lines with:
# + A JVM option like: -Xmx2000m
# + A System Property like: -Dcom.sun.management.jmxremote
#
#-----------------------------------------------------------
#===========================================================
# The start.d directory contains the active start.ini fragments
start.d/
#-----------------------------------------------------------