415826 start.jar module --enable and --disable

morphed mechanism into --initialize based templates

8 files changed, 69 insertions, 11 deletions

diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
index deef173687..85f6b9c684 100644
--- a/jetty-server/src/main/config/etc/jetty-ipaccess.xml
+++ b/jetty-server/src/main/config/etc/jetty-ipaccess.xml
@@ -15,17 +15,16 @@
       <Set name="handler"><Ref refid="oldhandler"/></Set>
       <Set name="white">
         <Array type="String">
-	  <Item>127.0.0.1</Item>
-	  <Item>127.0.0.2/*.html</Item>
-	</Array>
+	      <Item>127.0.0.1</Item>
+	      <Item>127.0.0.2/*.html</Item>
+	    </Array>
       </Set>
       <Set name="black">
         <Array type="String">
-	  <Item>127.0.0.1/blacklisted</Item>
-	  <Item>127.0.0.2/black.html</Item>
-	</Array>
+	      <Item>127.0.0.1/blacklisted</Item>
+	      <Item>127.0.0.2/black.html</Item>
+	    </Array>
       </Set>
      </New>
     </Set>
-
 </Configure>
diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod
index 94eed962e9..e1feadcaab 100644
--- a/jetty-server/src/main/config/modules/http.mod
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -1,7 +1,10 @@
 #
-# Jetty HTTP Server
+# Jetty HTTP Connector
 #
 
 DEPEND=server
 
 etc/jetty-http.xml
+
+INI=jetty.port=8080
+INI=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 5e930e934f..3b087d3ef9 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -1,8 +1,9 @@
 #
-# Jetty HTTP Server
+# Jetty HTTPS Connector
 #
 
-DEPEND=server
+DEPEND=ssl
 
-etc/jetty-ssl.xml
 etc/jetty-https.xml
+
+INI=# jetty.https.port=8443
\ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
new file mode 100644
index 0000000000..cfec783974
--- /dev/null
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -0,0 +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
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
index 578d8165ed..101f638f40 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -5,3 +5,10 @@
 DEPEND=server
 
 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
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 060ca9f0a2..03c726c4ae 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -5,3 +5,7 @@
 DEPEND=server
 
 etc/jetty-requestlog.xml
+
+INI=# requestlog.retain=90
+INI=# requestlog.append=true
+INI=# requestlog.extended=true
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index aa6cad6b0e..ea6321a6f6 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -4,6 +4,7 @@
 
 DEPEND=base
 DEPEND=xml
+OPTIONAL=jvm
 
 LIB=lib/servlet-api-3.1.jar
 LIB=lib/jetty-schemas-3.1.jar
@@ -13,3 +14,10 @@ LIB=lib/jetty-server-${jetty.version}.jar
 
 # 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
\ No newline at end of file
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
new file mode 100644
index 0000000000..2bfc167e93
--- /dev/null
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -0,0 +1,12 @@
+
+# SSL Keystore module
+
+DEPEND=server
+etc/jetty-ssl.xml
+
+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