update other jetty mods to new format

13 files changed, 106 insertions, 77 deletions

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