Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2013-08-29 17:39:28 -0400
committerJesse McConnell2013-08-29 17:39:28 -0400
commitac30f5c9bd10fc62497324cf936ad4992394c72f (patch)
treee5cf421f5ebe12d0aa83daa69085a533f1f32da2
parent6e3094e1b023ee5fe69042815da356495cf5f1dc (diff)
downloadorg.eclipse.jetty.project-ac30f5c9bd10fc62497324cf936ad4992394c72f.tar.gz
org.eclipse.jetty.project-ac30f5c9bd10fc62497324cf936ad4992394c72f.tar.xz
org.eclipse.jetty.project-ac30f5c9bd10fc62497324cf936ad4992394c72f.zip
update other jetty mods to new format
-rw-r--r--jetty-annotations/src/main/config/modules/annotations.mod9
-rw-r--r--jetty-client/src/main/config/modules/client.mod3
-rw-r--r--jetty-deploy/src/main/config/modules/deploy.mod7
-rw-r--r--jetty-distribution/src/main/resources/modules/setuid.mod17
-rw-r--r--jetty-jaas/src/main/config/modules/jaas.mod10
-rw-r--r--jetty-jmx/src/main/config/modules/jmx.mod11
-rw-r--r--jetty-jndi/src/main/config/modules/jndi.mod8
-rw-r--r--jetty-jsp/src/main/config/modules/jsp.mod6
-rw-r--r--jetty-monitor/src/main/config/modules/monitor.mod9
-rw-r--r--jetty-nosql/src/main/config/modules/nosql.mod6
-rw-r--r--jetty-overlay-deployer/src/main/config/modules/overlay.mod7
-rw-r--r--jetty-plus/src/main/config/modules/plus.mod11
-rw-r--r--jetty-proxy/src/main/config/modules/proxy.mod9
-rw-r--r--jetty-rewrite/src/main/config/modules/rewrite.mod7
-rw-r--r--jetty-security/src/main/config/modules/security.mod6
-rw-r--r--jetty-server/src/main/config/modules/debug.mod4
-rw-r--r--jetty-server/src/main/config/modules/ext.mod4
-rw-r--r--jetty-server/src/main/config/modules/http.mod9
-rw-r--r--jetty-server/src/main/config/modules/https.mod9
-rw-r--r--jetty-server/src/main/config/modules/ipaccess.mod4
-rw-r--r--jetty-server/src/main/config/modules/jvm.mod48
-rw-r--r--jetty-server/src/main/config/modules/lowresources.mod17
-rw-r--r--jetty-server/src/main/config/modules/requestlog.mod11
-rw-r--r--jetty-server/src/main/config/modules/resources.mod4
-rw-r--r--jetty-server/src/main/config/modules/server.mod41
-rw-r--r--jetty-server/src/main/config/modules/ssl.mod24
-rw-r--r--jetty-server/src/main/config/modules/stats.mod4
-rw-r--r--jetty-server/src/main/config/modules/xinetd.mod4
-rw-r--r--jetty-servlet/src/main/config/modules/servlet.mod6
-rw-r--r--jetty-servlets/src/main/config/modules/servlets.mod6
-rw-r--r--jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod8
-rw-r--r--jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod17
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/Module.java1
-rw-r--r--jetty-webapp/src/main/config/modules/webapp.mod6
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod9
35 files changed, 223 insertions, 139 deletions
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
index 3470bf75c7..65e4654127 100644
--- a/jetty-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -2,13 +2,16 @@
# Jetty Annotation Scanning Module
#
+[depend]
# Annotations needs plus, and jndi features
-DEPEND=plus
+plus
+[lib]
# Annotations needs jetty annotation jars
-LIB=lib/jetty-annotations-${jetty.version}.jar
+lib/jetty-annotations-${jetty.version}.jar
# Need annotation processing jars too
-LIB=lib/annotations/*.jar
+lib/annotations/*.jar
+[xml]
# Enable annotation scanning webapp configurations
etc/jetty-annotations.xml
diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod
index f434cdc087..6788eacf79 100644
--- a/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -2,5 +2,6 @@
# Client Feature
#
+[lib]
# Client jars
-LIB=lib/jetty-client-${jetty.version}.jar
+lib/jetty-client-${jetty.version}.jar
diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod
index 47fc62c177..94c0e40316 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -2,10 +2,13 @@
# Deploy Feature
#
-DEPEND=webapp
+[depend]
+webapp
+[lib]
# Deploy jars
-LIB=lib/jetty-deploy-${jetty.version}.jar
+lib/jetty-deploy-${jetty.version}.jar
+[xml]
# Deploy configuration
etc/jetty-deploy.xml
diff --git a/jetty-distribution/src/main/resources/modules/setuid.mod b/jetty-distribution/src/main/resources/modules/setuid.mod
index f939eb17a9..d6b5d1e188 100644
--- a/jetty-distribution/src/main/resources/modules/setuid.mod
+++ b/jetty-distribution/src/main/resources/modules/setuid.mod
@@ -1,9 +1,14 @@
-DEPEND=server
-LIB=jetty-setuid-java-1.0.1.jar
+[depend]
+server
+[lib]
+jetty-setuid-java-1.0.1.jar
+
+[xml]
etc/jetty-setuid.xml
-INI=# jetty.startServerAsPrivileged=false
-INI=# jetty.username=jetty
-INI=# jetty.groupname=jetty
-INI=# jetty.umask=002
+[ini]
+# jetty.startServerAsPrivileged=false
+# jetty.username=jetty
+# jetty.groupname=jetty
+# jetty.umask=002
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index 8fdba5ada4..521d151f3c 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -2,12 +2,16 @@
# JAAS Feature
#
-DEPEND=server
+[depend]
+server
+[lib]
# JAAS jars
-LIB=lib/jetty-jaas-${jetty.version}.jar
+lib/jetty-jaas-${jetty.version}.jar
+[xml]
# JAAS configuration
etc/jetty-jaas.xml
-INI=jaas.login.conf=etc/login.conf \ No newline at end of file
+[ini]
+jaas.login.conf=etc/login.conf \ No newline at end of file
diff --git a/jetty-jmx/src/main/config/modules/jmx.mod b/jetty-jmx/src/main/config/modules/jmx.mod
index 11224a299c..37c0cc3930 100644
--- a/jetty-jmx/src/main/config/modules/jmx.mod
+++ b/jetty-jmx/src/main/config/modules/jmx.mod
@@ -2,12 +2,15 @@
# JMX Feature
#
+[lib]
# JMX jars (as defined in start.config)
-LIB=lib/jetty-jmx-${jetty.version}.jar
+lib/jetty-jmx-${jetty.version}.jar
+[xml]
# JMX configuration
etc/jetty-jmx.xml
-INI=# jetty.jmxrmihost=localhost
-INI=# jetty.jmxrmiport=1099
-INI=# -Dcom.sun.management.jmxremote \ No newline at end of file
+[ini]
+# jetty.jmxrmihost=localhost
+# jetty.jmxrmiport=1099
+# -Dcom.sun.management.jmxremote \ No newline at end of file
diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
index cfdcc52614..33c077ce68 100644
--- a/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -2,8 +2,10 @@
# JNDI Support
#
-DEPEND=server
+[depend]
+server
-LIB=lib/jetty-jndi-${jetty.version}.jar
-LIB=lib/jndi/*.jar
+[lib]
+lib/jetty-jndi-${jetty.version}.jar
+lib/jndi/*.jar
diff --git a/jetty-jsp/src/main/config/modules/jsp.mod b/jetty-jsp/src/main/config/modules/jsp.mod
index d24dddf44d..f85530d3c8 100644
--- a/jetty-jsp/src/main/config/modules/jsp.mod
+++ b/jetty-jsp/src/main/config/modules/jsp.mod
@@ -2,7 +2,9 @@
# Jetty Servlet Module
#
-DEPEND=servlet
+[depend]
+servlet
-LIB=lib/jsp/*.jar
+[lib]
+lib/jsp/*.jar
diff --git a/jetty-monitor/src/main/config/modules/monitor.mod b/jetty-monitor/src/main/config/modules/monitor.mod
index 249ccef15d..67f006d0c4 100644
--- a/jetty-monitor/src/main/config/modules/monitor.mod
+++ b/jetty-monitor/src/main/config/modules/monitor.mod
@@ -2,9 +2,12 @@
# Jetty Monitor module
#
-DEPEND=server
-DEPEND=client
+[depend]
+server
+client
-LIB=lib/jetty-monitor-${jetty.version}.jar
+[lib]
+lib/jetty-monitor-${jetty.version}.jar
+[xml]
etc/jetty-monitor.xml \ No newline at end of file
diff --git a/jetty-nosql/src/main/config/modules/nosql.mod b/jetty-nosql/src/main/config/modules/nosql.mod
index 3d8b099ed0..a4189c945b 100644
--- a/jetty-nosql/src/main/config/modules/nosql.mod
+++ b/jetty-nosql/src/main/config/modules/nosql.mod
@@ -2,6 +2,8 @@
# Jetty Nosql module
#
-DEPEND=webapp
+[depend]
+webapp
-LIB=lib/jetty-nosql-${jetty.version}.jar \ No newline at end of file
+[lib]
+lib/jetty-nosql-${jetty.version}.jar \ No newline at end of file
diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
index a006476a60..5e73f6bc29 100644
--- a/jetty-overlay-deployer/src/main/config/modules/overlay.mod
+++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
@@ -2,9 +2,12 @@
# 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
etc/jetty-overlay.xml
diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod
index caa799376a..b781f00bf2 100644
--- a/jetty-plus/src/main/config/modules/plus.mod
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -2,11 +2,14 @@
# Jetty Proxy module
#
-DEPEND=server
-DEPEND=security
-DEPEND=jndi
+[depend]
+server
+security
+jndi
-LIB=lib/jetty-plus-${jetty.version}.jar
+[lib]
+lib/jetty-plus-${jetty.version}.jar
+[xml]
# Plus requires configuration
etc/jetty-plus.xml
diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod
index 5ab6e70a88..7873329afa 100644
--- a/jetty-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -2,10 +2,13 @@
# Jetty Proxy module
#
-DEPEND=server
-DEPEND=client
+[depend]
+server
+client
-LIB=lib/jetty-proxy-${jetty.version}.jar
+[lib]
+lib/jetty-proxy-${jetty.version}.jar
+[xml]
# Proxy requires configuration
etc/jetty-proxy.xml
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
index d5ccf96041..85fe5f090d 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -2,9 +2,12 @@
# 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
etc/jetty-rewrite.xml
diff --git a/jetty-security/src/main/config/modules/security.mod b/jetty-security/src/main/config/modules/security.mod
index 5a3c4a368a..ba3163275f 100644
--- a/jetty-security/src/main/config/modules/security.mod
+++ b/jetty-security/src/main/config/modules/security.mod
@@ -2,6 +2,8 @@
# Jetty Security Module
#
-DEPEND=server
+[depend]
+server
-LIB=lib/jetty-security-${jetty.version}.jar
+[lib]
+lib/jetty-security-${jetty.version}.jar
diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod
index 8cdf5b94ab..f740ea2c76 100644
--- a/jetty-server/src/main/config/modules/debug.mod
+++ b/jetty-server/src/main/config/modules/debug.mod
@@ -2,6 +2,8 @@
# Debug module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-debug.xml
diff --git a/jetty-server/src/main/config/modules/ext.mod b/jetty-server/src/main/config/modules/ext.mod
index 1e09cd62d8..e8b9021ffd 100644
--- a/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-server/src/main/config/modules/ext.mod
@@ -1,2 +1,2 @@
-
-LIB=lib/ext/* \ No newline at end of file
+[lib]
+lib/ext/* \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod
index e1feadcaab..e5e923a6c3 100644
--- a/jetty-server/src/main/config/modules/http.mod
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -2,9 +2,12 @@
# Jetty HTTP Connector
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-http.xml
-INI=jetty.port=8080
-INI=http.timeout=30000 \ No newline at end of file
+[ini]
+jetty.port=8080
+http.timeout=30000 \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod
index 655630e0e1..609b26a9d9 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -2,9 +2,12 @@
# Jetty HTTPS Connector
#
-DEPEND=ssl
+[depend]
+ssl
+[xml]
etc/jetty-https.xml
-INI=https.port=8443
-INI=https.timeout=30000 \ No newline at end of file
+[ini]
+https.port=8443
+https.timeout=30000 \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod
index f99f26ec3e..956ea0f2e3 100644
--- a/jetty-server/src/main/config/modules/ipaccess.mod
+++ b/jetty-server/src/main/config/modules/ipaccess.mod
@@ -2,6 +2,8 @@
# IPAccess module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-ipaccess.xml
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
index cfec783974..5fc8680fe3 100644
--- a/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -1,24 +1,24 @@
-
-INI=#===========================================================
-INI=# Configure JVM arguments.
-INI=# 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.
-INI=# If you wish to avoid an extra JVM running, place JVM args
-INI=# on the normal command line and do not use --exec
-INI=#-----------------------------------------------------------
-INI=# --exec
-INI=# -Xmx2000m
-INI=# -Xmn512m
-INI=# -XX:+UseConcMarkSweepGC
-INI=# -XX:ParallelCMSThreads=2
-INI=# -XX:+CMSClassUnloadingEnabled
-INI=# -XX:+UseCMSCompactAtFullCollection
-INI=# -XX:CMSInitiatingOccupancyFraction=80
-INI=# -verbose:gc
-INI=# -XX:+PrintGCDateStamps
-INI=# -XX:+PrintGCTimeStamps
-INI=# -XX:+PrintGCDetails
-INI=# -XX:+PrintTenuringDistribution
-INI=# -XX:+PrintCommandLineFlags
-INI=# -XX:+DisableExplicitGC
-INI=# -Dorg.apache.jasper.compiler.disablejsr199=true \ No newline at end of file
+[ini]
+#===========================================================
+# 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
+#-----------------------------------------------------------
+# --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 \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
index 101f638f40..bcb781fb7b 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -2,13 +2,16 @@
# Low Resources module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-lowresources.xml
-INI=# lowresources.period=1050
-INI=# lowresources.lowResourcesIdleTimeout=200
-INI=# lowresources.monitorThreads=true
-INI=# lowresources.maxConnections=0
-INI=# lowresources.maxMemory=0
-INI=# lowresources.maxLowResourcesTime=5000 \ No newline at end of file
+[ini]
+# lowresources.period=1050
+# lowresources.lowResourcesIdleTimeout=200
+# lowresources.monitorThreads=true
+# lowresources.maxConnections=0
+# lowresources.maxMemory=0
+# lowresources.maxLowResourcesTime=5000 \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 03c726c4ae..9d17958a46 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -2,10 +2,13 @@
# Request Log module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-requestlog.xml
-INI=# requestlog.retain=90
-INI=# requestlog.append=true
-INI=# requestlog.extended=true
+[ini]
+# requestlog.retain=90
+# requestlog.append=true
+# requestlog.extended=true
diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod
index 5782922a2e..2064da718b 100644
--- a/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-server/src/main/config/modules/resources.mod
@@ -1,2 +1,2 @@
-
-LIB=resources \ No newline at end of file
+[lib]
+resources \ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index 3eada328e6..dcd608852e 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -2,29 +2,32 @@
# Base server
#
-OPTIONAL=jvm
-OPTIONAL=jmx
-OPTIONAL=ext
-OPTIONAL=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
+[optional]
+jvm
+jmx
+ext
+resources
+[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
etc/jetty.xml
-INI=threads.min=10
-INI=threads.max=200
-INI=threads.timeout=60000
-INI=#jetty.host=myhost.com
-INI=jetty.dump.start=false
-INI=jetty.dump.stop=false
+[ini]
+threads.min=10
+threads.max=200
+threads.timeout=60000
+#jetty.host=myhost.com
+jetty.dump.start=false
+jetty.dump.stop=false
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index 96d6f81aa4..be4a4aebe3 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -1,13 +1,19 @@
# SSL Keystore module
-DEPEND=server
+[depend]
+server
+
+[xml]
etc/jetty-ssl.xml
-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
-INI=jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-INI=jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
-INI=jetty.truststore=etc/keystore
-INI=jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-INI=jetty.secure.port=8443
+
+[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
+jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
+jetty.truststore=etc/keystore
+jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
+jetty.secure.port=8443
diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
index cd56d5b4d7..0922469cdf 100644
--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -2,6 +2,8 @@
# Stats module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-stats.xml
diff --git a/jetty-server/src/main/config/modules/xinetd.mod b/jetty-server/src/main/config/modules/xinetd.mod
index c93064ad76..fdc1b3c7b0 100644
--- a/jetty-server/src/main/config/modules/xinetd.mod
+++ b/jetty-server/src/main/config/modules/xinetd.mod
@@ -2,6 +2,8 @@
# Stats module
#
-DEPEND=server
+[depend]
+server
+[xml]
etc/jetty-xinetd.xml
diff --git a/jetty-servlet/src/main/config/modules/servlet.mod b/jetty-servlet/src/main/config/modules/servlet.mod
index a427eed547..fdb65c57a1 100644
--- a/jetty-servlet/src/main/config/modules/servlet.mod
+++ b/jetty-servlet/src/main/config/modules/servlet.mod
@@ -2,6 +2,8 @@
# Jetty Servlet Module
#
-DEPEND=server
+[depend]
+server
-LIB=lib/jetty-servlet-${jetty.version}.jar
+[lib]
+lib/jetty-servlet-${jetty.version}.jar
diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod
index 3d471891da..02cd72b852 100644
--- a/jetty-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-servlets/src/main/config/modules/servlets.mod
@@ -2,6 +2,8 @@
# Jetty Servlets Module
#
-DEPEND=servlet
+[depend]
+servlet
-LIB=lib/jetty-servlets-${jetty.version}.jar
+[lib]
+lib/jetty-servlets-${jetty.version}.jar
diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod
index 10750265b5..7dfa4b8511 100644
--- a/jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/npn.mod
@@ -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=--exec \ No newline at end of file
+[ini]
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
+--exec \ No newline at end of file
diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
index 4661fe7e24..2fb30355db 100644
--- a/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
@@ -1,12 +1,15 @@
+[depend]
+ssl
+npn
-DEPEND=ssl
-DEPEND=npn
-
-LIB=lib/spdy/*.jar
+[lib]
+lib/spdy/*.jar
+[xml]
etc/jetty-ssl.xml
etc/jetty-spdy.xml
-INI=spdy.port=8443
-INI=spdy.timeout=30000
-INI=#spdy.initialWindowSize=65536 \ No newline at end of file
+[ini]
+spdy.port=8443
+spdy.timeout=30000
+#spdy.initialWindowSize=65536 \ No newline at end of file
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
index 87b1fc1c05..c0563b72a1 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
@@ -274,7 +274,6 @@ public class Module // extends TextFile
}
else
{
- System.out.println("Processing: " + line);
// blank lines and comments are valid for initialize section
if (line.length() == 0 || line.startsWith("#"))
{
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index c39d5aae06..f62c554555 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -2,6 +2,8 @@
# Base server
#
-DEPEND=servlet
+[depend]
+servlet
-LIB=lib/jetty-webapp-${jetty.version}.jar
+[lib]
+lib/jetty-webapp-${jetty.version}.jar
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index a74a1072ac..ecf5b3c070 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -2,13 +2,16 @@
# WebSocket Feature
#
+[depend]
# WebSocket needs Annotations feature
-DEPEND=server
-DEPEND=annotations
+server
+annotations
+[lib]
# WebSocket needs websocket jars (as defined in start.config)
-LIB=lib/websocket/*.jar
+lib/websocket/*.jar
+[xml]
# WebSocket needs websocket configuration
etc/jetty-websockets.xml

Back to the top