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

update other jetty mods to new format

This commit is contained in:
Jesse McConnell 2013-08-29 16:39:28 -05:00
parent 6e3094e1b0
commit ac30f5c9bd
35 changed files with 223 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,16 @@
# Jetty Annotation Scanning Module # Jetty Annotation Scanning Module
# #
[depend]
# Annotations needs plus, and jndi features # Annotations needs plus, and jndi features
DEPEND=plus plus
[lib]
# Annotations needs jetty annotation jars # Annotations needs jetty annotation jars
LIB=lib/jetty-annotations-${jetty.version}.jar lib/jetty-annotations-${jetty.version}.jar
# Need annotation processing jars too # Need annotation processing jars too
LIB=lib/annotations/*.jar lib/annotations/*.jar
[xml]
# Enable annotation scanning webapp configurations # Enable annotation scanning webapp configurations
etc/jetty-annotations.xml etc/jetty-annotations.xml

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

@ -2,5 +2,6 @@
# Client Feature # Client Feature
# #
[lib]
# Client jars # Client jars
LIB=lib/jetty-client-${jetty.version}.jar lib/jetty-client-${jetty.version}.jar

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

@ -2,10 +2,13 @@
# Deploy Feature # Deploy Feature
# #
DEPEND=webapp [depend]
webapp
[lib]
# Deploy jars # Deploy jars
LIB=lib/jetty-deploy-${jetty.version}.jar lib/jetty-deploy-${jetty.version}.jar
[xml]
# Deploy configuration # Deploy configuration
etc/jetty-deploy.xml etc/jetty-deploy.xml

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

@ -1,9 +1,14 @@
DEPEND=server [depend]
LIB=jetty-setuid-java-1.0.1.jar server
[lib]
jetty-setuid-java-1.0.1.jar
[xml]
etc/jetty-setuid.xml etc/jetty-setuid.xml
INI=# jetty.startServerAsPrivileged=false [ini]
INI=# jetty.username=jetty # jetty.startServerAsPrivileged=false
INI=# jetty.groupname=jetty # jetty.username=jetty
INI=# jetty.umask=002 # jetty.groupname=jetty
# jetty.umask=002

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

@ -2,12 +2,16 @@
# JAAS Feature # JAAS Feature
# #
DEPEND=server [depend]
server
[lib]
# JAAS jars # JAAS jars
LIB=lib/jetty-jaas-${jetty.version}.jar lib/jetty-jaas-${jetty.version}.jar
[xml]
# JAAS configuration # JAAS configuration
etc/jetty-jaas.xml etc/jetty-jaas.xml
INI=jaas.login.conf=etc/login.conf [ini]
jaas.login.conf=etc/login.conf

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

@ -2,12 +2,15 @@
# JMX Feature # JMX Feature
# #
[lib]
# JMX jars (as defined in start.config) # JMX jars (as defined in start.config)
LIB=lib/jetty-jmx-${jetty.version}.jar lib/jetty-jmx-${jetty.version}.jar
[xml]
# JMX configuration # JMX configuration
etc/jetty-jmx.xml etc/jetty-jmx.xml
INI=# jetty.jmxrmihost=localhost [ini]
INI=# jetty.jmxrmiport=1099 # jetty.jmxrmihost=localhost
INI=# -Dcom.sun.management.jmxremote # jetty.jmxrmiport=1099
# -Dcom.sun.management.jmxremote

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

@ -2,8 +2,10 @@
# JNDI Support # JNDI Support
# #
DEPEND=server [depend]
server
LIB=lib/jetty-jndi-${jetty.version}.jar [lib]
LIB=lib/jndi/*.jar lib/jetty-jndi-${jetty.version}.jar
lib/jndi/*.jar

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

@ -2,7 +2,9 @@
# Jetty Servlet Module # Jetty Servlet Module
# #
DEPEND=servlet [depend]
servlet
LIB=lib/jsp/*.jar [lib]
lib/jsp/*.jar

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

@ -2,9 +2,12 @@
# Jetty Monitor module # Jetty Monitor module
# #
DEPEND=server [depend]
DEPEND=client server
client
LIB=lib/jetty-monitor-${jetty.version}.jar [lib]
lib/jetty-monitor-${jetty.version}.jar
[xml]
etc/jetty-monitor.xml etc/jetty-monitor.xml

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

@ -2,6 +2,8 @@
# Jetty Nosql module # Jetty Nosql module
# #
DEPEND=webapp [depend]
webapp
LIB=lib/jetty-nosql-${jetty.version}.jar [lib]
lib/jetty-nosql-${jetty.version}.jar

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

@ -2,9 +2,12 @@
# Jetty Overlay module # Jetty Overlay module
# #
DEPEND=deploy [depend]
deploy
LIB=lib/jetty-overlay-deployer-${jetty.version}.jar [lib]
lib/jetty-overlay-deployer-${jetty.version}.jar
[xml]
# Plus requires configuration # Plus requires configuration
etc/jetty-overlay.xml etc/jetty-overlay.xml

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

@ -2,11 +2,14 @@
# Jetty Proxy module # Jetty Proxy module
# #
DEPEND=server [depend]
DEPEND=security server
DEPEND=jndi security
jndi
LIB=lib/jetty-plus-${jetty.version}.jar [lib]
lib/jetty-plus-${jetty.version}.jar
[xml]
# Plus requires configuration # Plus requires configuration
etc/jetty-plus.xml etc/jetty-plus.xml

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

@ -2,10 +2,13 @@
# Jetty Proxy module # Jetty Proxy module
# #
DEPEND=server [depend]
DEPEND=client server
client
LIB=lib/jetty-proxy-${jetty.version}.jar [lib]
lib/jetty-proxy-${jetty.version}.jar
[xml]
# Proxy requires configuration # Proxy requires configuration
etc/jetty-proxy.xml etc/jetty-proxy.xml

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

@ -2,9 +2,12 @@
# Jetty Rewrite module # Jetty Rewrite module
# #
DEPEND=server [depend]
server
LIB=lib/jetty-rewrite-${jetty.version}.jar [lib]
lib/jetty-rewrite-${jetty.version}.jar
[xml]
# Annotations needs annotations configuration # Annotations needs annotations configuration
etc/jetty-rewrite.xml etc/jetty-rewrite.xml

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

@ -2,6 +2,8 @@
# Jetty Security Module # Jetty Security Module
# #
DEPEND=server [depend]
server
LIB=lib/jetty-security-${jetty.version}.jar [lib]
lib/jetty-security-${jetty.version}.jar

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

@ -2,6 +2,8 @@
# Debug module # Debug module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-debug.xml etc/jetty-debug.xml

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

@ -1,2 +1,2 @@
[lib]
LIB=lib/ext/* lib/ext/*

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

@ -2,9 +2,12 @@
# Jetty HTTP Connector # Jetty HTTP Connector
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-http.xml etc/jetty-http.xml
INI=jetty.port=8080 [ini]
INI=http.timeout=30000 jetty.port=8080
http.timeout=30000

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

@ -2,9 +2,12 @@
# Jetty HTTPS Connector # Jetty HTTPS Connector
# #
DEPEND=ssl [depend]
ssl
[xml]
etc/jetty-https.xml etc/jetty-https.xml
INI=https.port=8443 [ini]
INI=https.timeout=30000 https.port=8443
https.timeout=30000

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

@ -2,6 +2,8 @@
# IPAccess module # IPAccess module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-ipaccess.xml etc/jetty-ipaccess.xml

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

@ -1,24 +1,24 @@
[ini]
INI=#=========================================================== #===========================================================
INI=# Configure JVM arguments. # Configure JVM arguments.
INI=# If JVM args are include in an ini file then --exec is needed # If JVM args are include in an ini file then --exec is needed
INI=# to start a new JVM from start.jar with the extra args. # to start a new JVM from start.jar with the extra args.
INI=# If you wish to avoid an extra JVM running, place JVM args # If you wish to avoid an extra JVM running, place JVM args
INI=# on the normal command line and do not use --exec # on the normal command line and do not use --exec
INI=#----------------------------------------------------------- #-----------------------------------------------------------
INI=# --exec # --exec
INI=# -Xmx2000m # -Xmx2000m
INI=# -Xmn512m # -Xmn512m
INI=# -XX:+UseConcMarkSweepGC # -XX:+UseConcMarkSweepGC
INI=# -XX:ParallelCMSThreads=2 # -XX:ParallelCMSThreads=2
INI=# -XX:+CMSClassUnloadingEnabled # -XX:+CMSClassUnloadingEnabled
INI=# -XX:+UseCMSCompactAtFullCollection # -XX:+UseCMSCompactAtFullCollection
INI=# -XX:CMSInitiatingOccupancyFraction=80 # -XX:CMSInitiatingOccupancyFraction=80
INI=# -verbose:gc # -verbose:gc
INI=# -XX:+PrintGCDateStamps # -XX:+PrintGCDateStamps
INI=# -XX:+PrintGCTimeStamps # -XX:+PrintGCTimeStamps
INI=# -XX:+PrintGCDetails # -XX:+PrintGCDetails
INI=# -XX:+PrintTenuringDistribution # -XX:+PrintTenuringDistribution
INI=# -XX:+PrintCommandLineFlags # -XX:+PrintCommandLineFlags
INI=# -XX:+DisableExplicitGC # -XX:+DisableExplicitGC
INI=# -Dorg.apache.jasper.compiler.disablejsr199=true # -Dorg.apache.jasper.compiler.disablejsr199=true

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

@ -2,13 +2,16 @@
# Low Resources module # Low Resources module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-lowresources.xml etc/jetty-lowresources.xml
INI=# lowresources.period=1050 [ini]
INI=# lowresources.lowResourcesIdleTimeout=200 # lowresources.period=1050
INI=# lowresources.monitorThreads=true # lowresources.lowResourcesIdleTimeout=200
INI=# lowresources.maxConnections=0 # lowresources.monitorThreads=true
INI=# lowresources.maxMemory=0 # lowresources.maxConnections=0
INI=# lowresources.maxLowResourcesTime=5000 # lowresources.maxMemory=0
# lowresources.maxLowResourcesTime=5000

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

@ -2,10 +2,13 @@
# Request Log module # Request Log module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-requestlog.xml etc/jetty-requestlog.xml
INI=# requestlog.retain=90 [ini]
INI=# requestlog.append=true # requestlog.retain=90
INI=# requestlog.extended=true # requestlog.append=true
# requestlog.extended=true

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

@ -1,2 +1,2 @@
[lib]
LIB=resources resources

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

@ -2,29 +2,32 @@
# Base server # Base server
# #
OPTIONAL=jvm [optional]
OPTIONAL=jmx jvm
OPTIONAL=ext jmx
OPTIONAL=resources ext
resources
LIB=lib/servlet-api-3.1.jar
LIB=lib/jetty-schemas-3.1.jar
LIB=lib/jetty-http-${jetty.version}.jar
LIB=lib/jetty-continuation-${jetty.version}.jar
LIB=lib/jetty-server-${jetty.version}.jar
LIB=lib/jetty-xml-${jetty.version}.jar
LIB=lib/jetty-util-${jetty.version}.jar
LIB=lib/jetty-io-${jetty.version}.jar
[lib]
lib/servlet-api-3.1.jar
lib/jetty-schemas-3.1.jar
lib/jetty-http-${jetty.version}.jar
lib/jetty-continuation-${jetty.version}.jar
lib/jetty-server-${jetty.version}.jar
lib/jetty-xml-${jetty.version}.jar
lib/jetty-util-${jetty.version}.jar
lib/jetty-io-${jetty.version}.jar
[xml]
# Annotations needs annotations configuration # Annotations needs annotations configuration
etc/jetty.xml etc/jetty.xml
INI=threads.min=10 [ini]
INI=threads.max=200 threads.min=10
INI=threads.timeout=60000 threads.max=200
INI=#jetty.host=myhost.com threads.timeout=60000
INI=jetty.dump.start=false #jetty.host=myhost.com
INI=jetty.dump.stop=false jetty.dump.start=false
jetty.dump.stop=false

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

@ -1,13 +1,19 @@
# SSL Keystore module # SSL Keystore module
DEPEND=server [depend]
etc/jetty-ssl.xml server
DOWNLOAD=http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore:etc/keystore
INI=jetty.keystore=etc/keystore [xml]
INI=jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 etc/jetty-ssl.xml
INI=jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
INI=jetty.truststore=etc/keystore [download]
INI=jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore:etc/keystore
INI=jetty.secure.port=8443
[ini]
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

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

@ -2,6 +2,8 @@
# Stats module # Stats module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-stats.xml etc/jetty-stats.xml

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

@ -2,6 +2,8 @@
# Stats module # Stats module
# #
DEPEND=server [depend]
server
[xml]
etc/jetty-xinetd.xml etc/jetty-xinetd.xml

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

@ -2,6 +2,8 @@
# Jetty Servlet Module # Jetty Servlet Module
# #
DEPEND=server [depend]
server
LIB=lib/jetty-servlet-${jetty.version}.jar [lib]
lib/jetty-servlet-${jetty.version}.jar

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

@ -2,6 +2,8 @@
# Jetty Servlets Module # Jetty Servlets Module
# #
DEPEND=servlet [depend]
servlet
LIB=lib/jetty-servlets-${jetty.version}.jar [lib]
lib/jetty-servlets-${jetty.version}.jar

8
jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod
View File

@ -1,5 +1,7 @@
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 [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
INI=-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar [ini]
INI=--exec -Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
--exec

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

@ -1,12 +1,15 @@
[depend]
ssl
npn
DEPEND=ssl [lib]
DEPEND=npn lib/spdy/*.jar
LIB=lib/spdy/*.jar
[xml]
etc/jetty-ssl.xml etc/jetty-ssl.xml
etc/jetty-spdy.xml etc/jetty-spdy.xml
INI=spdy.port=8443 [ini]
INI=spdy.timeout=30000 spdy.port=8443
INI=#spdy.initialWindowSize=65536 spdy.timeout=30000
#spdy.initialWindowSize=65536

1
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
View File

@ -274,7 +274,6 @@ public class Module // extends TextFile
} }
else else
{ {
System.out.println("Processing: " + line);
// blank lines and comments are valid for initialize section // blank lines and comments are valid for initialize section
if (line.length() == 0 || line.startsWith("#")) if (line.length() == 0 || line.startsWith("#"))
{ {

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

@ -2,6 +2,8 @@
# Base server # Base server
# #
DEPEND=servlet [depend]
servlet
LIB=lib/jetty-webapp-${jetty.version}.jar [lib]
lib/jetty-webapp-${jetty.version}.jar

9
jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
View File

@ -2,13 +2,16 @@
# WebSocket Feature # WebSocket Feature
# #
[depend]
# WebSocket needs Annotations feature # WebSocket needs Annotations feature
DEPEND=server server
DEPEND=annotations annotations
[lib]
# WebSocket needs websocket jars (as defined in start.config) # WebSocket needs websocket jars (as defined in start.config)
LIB=lib/websocket/*.jar lib/websocket/*.jar
[xml]
# WebSocket needs websocket configuration # WebSocket needs websocket configuration
etc/jetty-websockets.xml etc/jetty-websockets.xml