jetty-9 xml configurations

6 files changed, 95 insertions, 24 deletions

diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml
index 0a2d63061d..e90f04a8f7 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure SSL for the Jetty Server                              -->
@@ -11,25 +11,52 @@
 <!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-  <!-- if NIO is not available, use org.eclipse.jetty.server.ssl.SslSocketConnector -->
-
-  <New id="sslContextFactory" class="org.eclipse.jetty.http.ssl.SslContextFactory">
-    <Set name="KeyStore"><Property name="jetty.home" default="." />/etc/keystore</Set>
+  <!-- =========================================================== -->
+  <!-- Setup a SSL Context factory                                 -->
+  <!-- =========================================================== -->
+  <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+    <Set name="KeyStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set>
     <Set name="KeyStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
     <Set name="KeyManagerPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-    <Set name="TrustStore"><Property name="jetty.home" default="." />/etc/keystore</Set>
+    <Set name="TrustStorePath"><Property name="jetty.home" default="." />/etc/keystore</Set>
     <Set name="TrustStorePassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
   </New>
+  
+  <!-- =========================================================== -->
+  <!-- Add HTTP Customizer for Secure request                      -->
+  <!-- =========================================================== -->
+  <Ref id="httpConfig">
+    <Call name="addCustomizer">
+      <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
+    </Call>
+  </Ref>
 
-  <Call name="addConnector">
+  <!-- =========================================================== -->
+  <!-- Set connectors                                              -->
+  <!-- =========================================================== -->
+  <Call id="sslConnector" name="addConnector">
     <Arg>
-      <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-        <Arg><Ref id="sslContextFactory" /></Arg>
-        <Set name="Port">8443</Set>
-        <Set name="idleTimeout">30000</Set>
-        <Set name="Acceptors">2</Set>
-        <Set name="AcceptQueueSize">100</Set>
-      </New>
+      <New class="org.eclipse.jetty.server.SelectChannelConnector">
+        <Arg name="server"><Ref id="Server" /></Arg>
+          <Arg name="factories">
+            <Array type="org.eclipse.jetty.server.ConnectionFactory">
+              <Item>
+                <New class="org.eclipse.jetty.server.SslConnectionFactory">
+                  <Arg name="next">http/1.1</Arg>
+                  <Arg name="sslContextFactory"><Ref id="sslContextFactory"/></Arg>
+                </New>
+              </Item>
+              <Item>
+                <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                  <Arg name="config"><Ref id="httpConfig"/></Arg>
+                </New>
+              </Item>
+            </Array>
+          </Arg>
+          <Set name="host"><Property name="jetty.host" /></Set>
+          <Set name="port">8443</Set>
+          <Set name="idleTimeout">30000</Set>
+        </New>
     </Arg>
   </Call>
 </Configure>
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 9d0f8b6a96..dec2d4da99 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -29,6 +29,21 @@
     </Arg>
     <Arg name="container"><Ref id="Container"/></Arg>
 
+
+    <!-- =========================================================== -->
+    <!-- HttpChannel Configuration                                   -->
+    <!-- =========================================================== -->
+    <New id="httpConfig" class="org.eclipse.jetty.server.HttpChannelConfig">
+      <Set name="secureScheme">https</Set>
+      <Set name="securePort">8443</Set>
+      <Set name="outputBufferSize">32768</Set>
+      <Set name="requestHeaderSize">8192</Set>
+      <Set name="responseHeaderSize">8192</Set>
+      <Call name="addCustomizer">
+        <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
+      </Call>
+    </New>
+    
     <!-- =========================================================== -->
     <!-- Set connectors                                              -->
     <!-- =========================================================== -->
@@ -36,6 +51,13 @@
       <Arg>
           <New class="org.eclipse.jetty.server.SelectChannelConnector">
             <Arg name="server"><Ref id="Server" /></Arg>
+            <Arg name="factories">
+              <Array type="org.eclipse.jetty.server.ConnectionFactory">
+              <Item><New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref id="httpConfig"/></Arg>
+              </New></Item>
+              </Array>
+            </Arg>
             <Set name="host"><Property name="jetty.host" /></Set>
             <Set name="port"><Property name="jetty.port" default="8080"/></Set>
             <Set name="idleTimeout">30000</Set>
@@ -68,7 +90,7 @@
     <Set name="sendServerVersion">true</Set>
     <Set name="sendDateHeader">true</Set>
     <Set name="stopTimeout">1000</Set>
-    <Set name="dumpAfterStart">false</Set>
+    <Set name="dumpAfterStart">true</Set>
     <Set name="dumpBeforeStop">false</Set>
 
 </Configure>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
index 9ef5d6a6b1..05986d89aa 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
@@ -23,6 +23,7 @@ package org.eclipse.jetty.server;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.util.annotation.Name;
 
 public class HttpConnectionFactory extends AbstractConnectionFactory implements HttpChannelConfig.ConnectionFactory
 {
@@ -34,7 +35,7 @@ public class HttpConnectionFactory extends AbstractConnectionFactory implements
         setInputBufferSize(16384);
     }
     
-    public HttpConnectionFactory(HttpChannelConfig config)
+    public HttpConnectionFactory(@Name("config") HttpChannelConfig config)
     {
         super(HttpVersion.HTTP_1_1.toString());
         _config=config;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SelectChannelConnector.java
index f794c70cd1..92a167207a 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/SelectChannelConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SelectChannelConnector.java
@@ -37,6 +37,7 @@ import org.eclipse.jetty.io.SelectChannelEndPoint;
 import org.eclipse.jetty.io.SelectorManager;
 import org.eclipse.jetty.io.SelectorManager.ManagedSelector;
 import org.eclipse.jetty.util.annotation.ManagedObject;
+import org.eclipse.jetty.util.annotation.Name;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.Scheduler;
 
@@ -55,35 +56,50 @@ public class SelectChannelConnector extends AbstractNetworkConnector
     private volatile int _lingerTime = -1;
 
     
-    public SelectChannelConnector(Server server)
+    public SelectChannelConnector(
+        @Name("server") Server server)
     {
         this(server,null,null,null,0,0,new HttpConnectionFactory());
     }
     
-    public SelectChannelConnector(Server server,ConnectionFactory... factories)
+    public SelectChannelConnector(
+        @Name("server") Server server,
+        @Name("factories") ConnectionFactory... factories)
     {
         this(server,null,null,null,0,0,factories);
     }
     
-    public SelectChannelConnector(Server server,SslContextFactory sslContextFactory)
+    public SelectChannelConnector(
+        @Name("server") Server server,
+        @Name("sslContextFactory") SslContextFactory sslContextFactory)
     {
         this(server,null,null,null,0,0,AbstractConnectionFactory.getFactories(sslContextFactory,new HttpConnectionFactory()));
     }
     
-    public SelectChannelConnector(Server server,SslContextFactory sslContextFactory,ConnectionFactory... factories)
+    public SelectChannelConnector(
+        @Name("server") Server server,
+        @Name("sslContextFactory") SslContextFactory sslContextFactory,
+        @Name("factories") ConnectionFactory... factories)
     {
         this(server,null,null,null,0,0,AbstractConnectionFactory.getFactories(sslContextFactory,factories));
     }
 
     /**
      * @param server    The server this connector will be added to. Must not be null.
-     * @param factory TODO
      * @param executor  An executor for this connector or null to use the servers executor
      * @param scheduler A scheduler for this connector or null to use the servers scheduler
      * @param pool      A buffer pool for this connector or null to use a default {@link ByteBufferPool}
      * @param acceptors the number of acceptor threads to use, or 0 for a default value.
+     * @param factories Zero or more {@link ConnectionFactory} instances.
      */
-    public SelectChannelConnector(Server server, Executor executor, Scheduler scheduler, ByteBufferPool pool, int acceptors,int selectors,ConnectionFactory... factories)
+    public SelectChannelConnector(
+        @Name("server") Server server, 
+        @Name("executor") Executor executor, 
+        @Name("scheduler") Scheduler scheduler, 
+        @Name("bufferPool") ByteBufferPool pool, 
+        @Name("acceptors") int acceptors,
+        @Name("selectors") int selectors,
+        @Name("factories") ConnectionFactory... factories)
     {
         super(server,executor,scheduler,pool,acceptors,factories);
         _manager = new ConnectorSelectorManager(selectors > 0 ? selectors : Math.max(1, (Runtime.getRuntime().availableProcessors()) / 4));
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
index 3109b03820..4a818cf466 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
@@ -27,6 +27,7 @@ import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.ssl.SslConnection;
+import org.eclipse.jetty.util.annotation.Name;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 public class SslConnectionFactory extends AbstractConnectionFactory
@@ -39,12 +40,12 @@ public class SslConnectionFactory extends AbstractConnectionFactory
         this(null,HttpVersion.HTTP_1_1.asString());
     }
     
-    public SslConnectionFactory(String nextProtocol)
+    public SslConnectionFactory(@Name("next") String nextProtocol)
     {
         this(null,nextProtocol);
     }
     
-    public SslConnectionFactory(SslContextFactory factory,String nextProtocol)
+    public SslConnectionFactory(@Name("sslContextFactory") SslContextFactory factory, @Name("next") String nextProtocol)
     {
         super("SSL-"+nextProtocol);
         _sslContextFactory=factory==null?new SslContextFactory():factory;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
index 436040eada..35e1aa1078 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
@@ -163,6 +163,10 @@ public class DefaultHandler extends AbstractHandler
             }
         }
 
+        writer.write("</ul><hr>");
+        writer.write("<a href=\"http://eclipse.org/jetty\"><img border=0 src=\"/favicon.ico\"/></a>&nbsp;");
+        writer.write("<a href=\"http://eclipse.org/jetty\">Powered by Jetty:// Java Web Server</a><hr/>\n");
+
         writer.write("\n</BODY>\n</HTML>\n");
         writer.flush();
         response.setContentLength(writer.size());