升级jetty 到最新版本0.9.2

Author: allwefantasy

config/application.yml

@@ -125,5 +125,5 @@ qps:
 qpslimit:
    enable: true
 dubbo:
-   disable: false
+   disable: true
    server: true

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.csdn</groupId>
     <artifactId>ServiceFramework</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT-9.2.16</version>
 
     <licenses>
         <license>
@@ -14,6 +14,13 @@
         </license>
     </licenses>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <scala.version>2.10.3</scala.version>
+        <!--9.2.16.v20160414/7.2.2.v20101205/8.0.4.v20111024-->
+        <jetty.version>9.2.16.v20160414</jetty.version>
+    </properties>
+
 
     <dependencies>
         <dependency>
@@ -45,29 +52,37 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>7.2.2.v20101205</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-continuation</artifactId>
-            <version>7.2.2.v20101205</version>
+            <version>${jetty.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>7.2.2.v20101205</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>7.2.2.v20101205</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>7.2.2.v20101205</version>
+            <version>${jetty.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
+
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -101,7 +116,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>jline</artifactId>
-            <version>2.10.3</version>
+            <version>${scala.version}</version>
         </dependency>
 
         <dependency>
@@ -114,12 +129,9 @@
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
             <version>0.5</version>
+            <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>9.2.8.v20150217</version>
-        </dependency>
+
 
     </dependencies>
 
@@ -145,7 +157,7 @@
                     <target>1.6</target>
                     <compilerArgument>-g</compilerArgument>
                     <verbose>true</verbose>
-					<encoding>UTF-8</encoding>
+                    <encoding>UTF-8</encoding>
                 </configuration>
 
             </plugin>
@@ -196,5 +208,16 @@
             </plugin>
         </plugins>
     </build>
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <name>releases</name>
+            <url>http://mvn.letv.com/nexus/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <url>http://mvn.letv.com/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 
 </project>

src/main/java/net/csdn/modules/http/HttpServer.java

@@ -22,14 +22,10 @@
 import net.csdn.modules.http.processor.impl.TraceHttpStartProcessor;
 import net.csdn.modules.http.support.HttpHolder;
 import net.csdn.modules.log.SystemLogger;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.SessionManager;
+import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.session.HashSessionManager;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.util.resource.Resource;
@@ -95,12 +91,19 @@ public HttpServer(Settings settings, SystemLogger systemLogger, RestController r
 
         Environment environment = new Environment(settings);
         disableMysql = settings.getAsBoolean(ServiceFramwork.mode + ".datasources.mysql.disable", false);
-        server = new Server();
-        SelectChannelConnector connector = new SelectChannelConnector();
+
         QueuedThreadPool threadPool = new QueuedThreadPool();
         threadPool.setMinThreads(settings.getAsInt("http.threads.min", 100));
         threadPool.setMaxThreads(settings.getAsInt("http.threads.max", 1000));
-        connector.setThreadPool(threadPool);
+
+        server = new Server(threadPool);
+
+        HttpConfiguration httpConfig = new HttpConfiguration();
+
+        ServerConnector connector = new ServerConnector(server,
+                new HttpConnectionFactory(httpConfig));
+
+
         httpPort = settings.getAsInt("http.port", generateHttpPort());
         connector.setPort(httpPort);