Update to 7.6.8.20121106

* Many bugfixes
* Many improvements

4 files changed, 160 insertions, 105 deletions

diff --git a/www/jetty7/Makefile b/www/jetty7/Makefile
index 6d003af305c..cd48b4e866e 100644
--- a/www/jetty7/Makefile
+++ b/www/jetty7/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:18 asau Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/03 13:56:13 ryoon Exp $
 #
 
-DISTNAME=	jetty-distribution-7.5.4.v20111024
+JETTYVER=	7.6.8.v20121106
+DISTNAME=	jetty-distribution-${JETTYVER}
 PKGNAME=	${DISTNAME:S/distribution-//:S/.v/./}
-PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://download.eclipse.org/jetty/7.5.4.v20111024/dist/
+MASTER_SITES=	http://download.eclipse.org/jetty/${JETTYVER}/dist/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jetty.codehaus.org/jetty/
diff --git a/www/jetty7/PLIST b/www/jetty7/PLIST
index 10ac1e1e2b1..d7cd327a386 100644
--- a/www/jetty7/PLIST
+++ b/www/jetty7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/15 22:19:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/01/03 13:56:13 ryoon Exp $
 share/examples/jetty/README.spnego
 share/examples/jetty/jdbcRealm.properties
 share/examples/jetty/jetty-ajp.xml
@@ -18,6 +18,8 @@ share/examples/jetty/jetty-policy.xml
 share/examples/jetty/jetty-proxy.xml
 share/examples/jetty/jetty-requestlog.xml
 share/examples/jetty/jetty-rewrite.xml
+share/examples/jetty/jetty-spdy-proxy.xml
+share/examples/jetty/jetty-spdy.xml
 share/examples/jetty/jetty-ssl.xml
 share/examples/jetty/jetty-stats.xml
 share/examples/jetty/jetty-testrealm.xml
@@ -53,12 +55,6 @@ share/jetty/javadoc/deprecated-list.html
 share/jetty/javadoc/help-doc.html
 share/jetty/javadoc/index-all.html
 share/jetty/javadoc/index.html
-share/jetty/javadoc/org/apache/jasper/compiler/JDTJavaCompiler.html
-share/jetty/javadoc/org/apache/jasper/compiler/class-use/JDTJavaCompiler.html
-share/jetty/javadoc/org/apache/jasper/compiler/package-frame.html
-share/jetty/javadoc/org/apache/jasper/compiler/package-summary.html
-share/jetty/javadoc/org/apache/jasper/compiler/package-tree.html
-share/jetty/javadoc/org/apache/jasper/compiler/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/ajp/Ajp13Connection.html
 share/jetty/javadoc/org/eclipse/jetty/ajp/Ajp13Generator.html
 share/jetty/javadoc/org/eclipse/jetty/ajp/Ajp13Packet.html
@@ -141,11 +137,13 @@ share/jetty/javadoc/org/eclipse/jetty/annotations/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/annotations/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/annotations/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/annotations/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/client/AbstractHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/Address.html
+share/jetty/javadoc/org/eclipse/jetty/client/AsyncHttpConnection.html
+share/jetty/javadoc/org/eclipse/jetty/client/BlockingHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/CachedExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/ContentExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpClient.html
-share/jetty/javadoc/org/eclipse/jetty/client/HttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpDestination.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpEventListener.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpEventListenerWrapper.html
@@ -153,11 +151,13 @@ share/jetty/javadoc/org/eclipse/jetty/client/HttpExchange.CachedExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpExchange.ContentExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/HttpExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/RedirectListener.html
+share/jetty/javadoc/org/eclipse/jetty/client/class-use/AbstractHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/Address.html
+share/jetty/javadoc/org/eclipse/jetty/client/class-use/AsyncHttpConnection.html
+share/jetty/javadoc/org/eclipse/jetty/client/class-use/BlockingHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/CachedExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/ContentExchange.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/HttpClient.html
-share/jetty/javadoc/org/eclipse/jetty/client/class-use/HttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/HttpDestination.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/HttpEventListener.html
 share/jetty/javadoc/org/eclipse/jetty/client/class-use/HttpEventListenerWrapper.html
@@ -209,16 +209,12 @@ share/jetty/javadoc/org/eclipse/jetty/continuation/ContinuationFilter.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/ContinuationListener.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/ContinuationSupport.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/ContinuationThrowable.html
-share/jetty/javadoc/org/eclipse/jetty/continuation/Jetty6Continuation.html
-share/jetty/javadoc/org/eclipse/jetty/continuation/Servlet3Continuation.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/Continuation.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/ContinuationFilter.FilteredContinuation.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/ContinuationFilter.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/ContinuationListener.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/ContinuationSupport.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/ContinuationThrowable.html
-share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/Jetty6Continuation.html
-share/jetty/javadoc/org/eclipse/jetty/continuation/class-use/Servlet3Continuation.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/continuation/package-tree.html
@@ -309,6 +305,7 @@ share/jetty/javadoc/org/eclipse/jetty/http/AbstractGenerator.html
 share/jetty/javadoc/org/eclipse/jetty/http/EncodedHttpURI.html
 share/jetty/javadoc/org/eclipse/jetty/http/Generator.html
 share/jetty/javadoc/org/eclipse/jetty/http/HttpBuffers.html
+share/jetty/javadoc/org/eclipse/jetty/http/HttpBuffersImpl.html
 share/jetty/javadoc/org/eclipse/jetty/http/HttpContent.ResourceAsHttpContent.html
 share/jetty/javadoc/org/eclipse/jetty/http/HttpContent.html
 share/jetty/javadoc/org/eclipse/jetty/http/HttpCookie.html
@@ -335,6 +332,7 @@ share/jetty/javadoc/org/eclipse/jetty/http/class-use/AbstractGenerator.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/EncodedHttpURI.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/Generator.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/HttpBuffers.html
+share/jetty/javadoc/org/eclipse/jetty/http/class-use/HttpBuffersImpl.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/HttpContent.ResourceAsHttpContent.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/HttpContent.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/HttpCookie.html
@@ -357,10 +355,10 @@ share/jetty/javadoc/org/eclipse/jetty/http/class-use/MimeTypes.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/Parser.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/PathMap.Entry.html
 share/jetty/javadoc/org/eclipse/jetty/http/class-use/PathMap.html
-share/jetty/javadoc/org/eclipse/jetty/http/gzip/GzipResponseWrapper.html
-share/jetty/javadoc/org/eclipse/jetty/http/gzip/GzipStream.html
-share/jetty/javadoc/org/eclipse/jetty/http/gzip/class-use/GzipResponseWrapper.html
-share/jetty/javadoc/org/eclipse/jetty/http/gzip/class-use/GzipStream.html
+share/jetty/javadoc/org/eclipse/jetty/http/gzip/AbstractCompressedStream.html
+share/jetty/javadoc/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.html
+share/jetty/javadoc/org/eclipse/jetty/http/gzip/class-use/AbstractCompressedStream.html
+share/jetty/javadoc/org/eclipse/jetty/http/gzip/class-use/CompressedResponseWrapper.html
 share/jetty/javadoc/org/eclipse/jetty/http/gzip/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/http/gzip/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/http/gzip/package-tree.html
@@ -369,29 +367,7 @@ share/jetty/javadoc/org/eclipse/jetty/http/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/http/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/http/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/http/package-use.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/B64Code.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/Constraint.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/Credential.Crypt.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/Credential.MD5.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/Credential.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/Password.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/UnixCrypt.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/B64Code.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/Constraint.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/Credential.Crypt.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/Credential.MD5.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/Credential.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/Password.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/class-use/UnixCrypt.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/package-frame.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/package-summary.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/package-tree.html
-share/jetty/javadoc/org/eclipse/jetty/http/security/package-use.html
-share/jetty/javadoc/org/eclipse/jetty/http/ssl/AliasedX509ExtendedKeyManager.html
-share/jetty/javadoc/org/eclipse/jetty/http/ssl/AliasedX509KeyManager.html
 share/jetty/javadoc/org/eclipse/jetty/http/ssl/SslContextFactory.html
-share/jetty/javadoc/org/eclipse/jetty/http/ssl/class-use/AliasedX509ExtendedKeyManager.html
-share/jetty/javadoc/org/eclipse/jetty/http/ssl/class-use/AliasedX509KeyManager.html
 share/jetty/javadoc/org/eclipse/jetty/http/ssl/class-use/SslContextFactory.html
 share/jetty/javadoc/org/eclipse/jetty/http/ssl/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/http/ssl/package-summary.html
@@ -469,6 +445,7 @@ share/jetty/javadoc/org/eclipse/jetty/io/class-use/UncheckedPrintWriter.html
 share/jetty/javadoc/org/eclipse/jetty/io/class-use/View.CaseInsensitive.html
 share/jetty/javadoc/org/eclipse/jetty/io/class-use/View.html
 share/jetty/javadoc/org/eclipse/jetty/io/class-use/WriterOutputStream.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/AsyncConnection.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/ChannelEndPoint.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/DirectNIOBuffer.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/IndirectNIOBuffer.html
@@ -478,7 +455,9 @@ share/jetty/javadoc/org/eclipse/jetty/io/nio/RandomAccessFileBuffer.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/SelectChannelEndPoint.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/SelectorManager.SelectSet.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/SelectorManager.html
-share/jetty/javadoc/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/SslConnection.SslEndPoint.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/SslConnection.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/AsyncConnection.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/ChannelEndPoint.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/DirectNIOBuffer.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/IndirectNIOBuffer.html
@@ -488,7 +467,8 @@ share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/RandomAccessFileBuffer.ht
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SelectChannelEndPoint.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SelectorManager.SelectSet.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SelectorManager.html
-share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SslSelectChannelEndPoint.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SslConnection.SslEndPoint.html
+share/jetty/javadoc/org/eclipse/jetty/io/nio/class-use/SslConnection.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/io/nio/package-tree.html
@@ -858,6 +838,9 @@ share/jetty/javadoc/org/eclipse/jetty/security/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/security/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/security/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/server/AbstractConnector.html
+share/jetty/javadoc/org/eclipse/jetty/server/AbstractHttpConnection.Output.html
+share/jetty/javadoc/org/eclipse/jetty/server/AbstractHttpConnection.OutputWriter.html
+share/jetty/javadoc/org/eclipse/jetty/server/AbstractHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/server/AsyncContext.html
 share/jetty/javadoc/org/eclipse/jetty/server/AsyncContinuation.AsyncEventState.html
 share/jetty/javadoc/org/eclipse/jetty/server/AsyncContinuation.html
@@ -877,9 +860,6 @@ share/jetty/javadoc/org/eclipse/jetty/server/Dispatcher.html
 share/jetty/javadoc/org/eclipse/jetty/server/DispatcherType.html
 share/jetty/javadoc/org/eclipse/jetty/server/Handler.html
 share/jetty/javadoc/org/eclipse/jetty/server/HandlerContainer.html
-share/jetty/javadoc/org/eclipse/jetty/server/HttpConnection.Output.html
-share/jetty/javadoc/org/eclipse/jetty/server/HttpConnection.OutputWriter.html
-share/jetty/javadoc/org/eclipse/jetty/server/HttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/server/HttpInput.html
 share/jetty/javadoc/org/eclipse/jetty/server/HttpOutput.html
 share/jetty/javadoc/org/eclipse/jetty/server/HttpWriter.html
@@ -909,6 +889,9 @@ share/jetty/javadoc/org/eclipse/jetty/server/bio/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/server/bio/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/server/bio/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/AbstractConnector.html
+share/jetty/javadoc/org/eclipse/jetty/server/class-use/AbstractHttpConnection.Output.html
+share/jetty/javadoc/org/eclipse/jetty/server/class-use/AbstractHttpConnection.OutputWriter.html
+share/jetty/javadoc/org/eclipse/jetty/server/class-use/AbstractHttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/AsyncContext.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/AsyncContinuation.AsyncEventState.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/AsyncContinuation.html
@@ -928,9 +911,6 @@ share/jetty/javadoc/org/eclipse/jetty/server/class-use/Dispatcher.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/DispatcherType.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/Handler.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/HandlerContainer.html
-share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpConnection.Output.html
-share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpConnection.OutputWriter.html
-share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpConnection.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpInput.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpOutput.html
 share/jetty/javadoc/org/eclipse/jetty/server/class-use/HttpWriter.html
@@ -1169,14 +1149,13 @@ share/jetty/javadoc/org/eclipse/jetty/servlet/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/servlet/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/servlet/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/servlet/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/servlets/BalancerServlet.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/CGI.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/CloseableDoSFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/ConcatServlet.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/CrossOriginFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/DoSFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/GzipFilter.html
-share/jetty/javadoc/org/eclipse/jetty/servlets/IncludableGzipFilter.IncludableGzipStream.html
-share/jetty/javadoc/org/eclipse/jetty/servlets/IncludableGzipFilter.IncludableResponseWrapper.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/IncludableGzipFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/MultiPartFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/ProxyServlet.Transparent.html
@@ -1185,14 +1164,13 @@ share/jetty/javadoc/org/eclipse/jetty/servlets/PutFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/QoSFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/UserAgentFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/WelcomeFilter.html
+share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/BalancerServlet.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/CGI.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/CloseableDoSFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/ConcatServlet.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/CrossOriginFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/DoSFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/GzipFilter.html
-share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/IncludableGzipFilter.IncludableGzipStream.html
-share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/IncludableGzipFilter.IncludableResponseWrapper.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/IncludableGzipFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/MultiPartFilter.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/class-use/ProxyServlet.Transparent.html
@@ -1206,6 +1184,7 @@ share/jetty/javadoc/org/eclipse/jetty/servlets/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/servlets/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/util/ArrayQueue.html
+share/jetty/javadoc/org/eclipse/jetty/util/Atomics.html
 share/jetty/javadoc/org/eclipse/jetty/util/Attributes.html
 share/jetty/javadoc/org/eclipse/jetty/util/AttributesMap.html
 share/jetty/javadoc/org/eclipse/jetty/util/B64Code.html
@@ -1280,6 +1259,7 @@ share/jetty/javadoc/org/eclipse/jetty/util/ajax/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/ajax/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/util/ajax/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/util/class-use/ArrayQueue.html
+share/jetty/javadoc/org/eclipse/jetty/util/class-use/Atomics.html
 share/jetty/javadoc/org/eclipse/jetty/util/class-use/Attributes.html
 share/jetty/javadoc/org/eclipse/jetty/util/class-use/AttributesMap.html
 share/jetty/javadoc/org/eclipse/jetty/util/class-use/B64Code.html
@@ -1343,18 +1323,26 @@ share/jetty/javadoc/org/eclipse/jetty/util/component/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/util/component/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/component/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/util/component/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/AbstractLogger.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/JavaUtilLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/Log.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/Logger.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/LoggerLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/Slf4jLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/StdErrLog.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/AbstractLogger.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/JavaUtilLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/Log.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/Logger.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/LoggerLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/Slf4jLog.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/class-use/StdErrLog.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/LogMBean.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/class-use/LogMBean.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/package-frame.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/package-summary.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/package-tree.html
+share/jetty/javadoc/org/eclipse/jetty/util/log/jmx/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/log/package-tree.html
@@ -1363,6 +1351,30 @@ share/jetty/javadoc/org/eclipse/jetty/util/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/util/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/util/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/AWTLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/AbstractLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/DOMLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/Java2DLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/LDAPLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/LoginConfigurationLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/SecurityProviderLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/AWTLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/AbstractLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/AppContextLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/DOMLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/DriverManagerLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/GCThreadLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/Java2DLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/LDAPLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/LoginConfigurationLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/class-use/SecurityProviderLeakPreventer.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/package-frame.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/package-summary.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/package-tree.html
+share/jetty/javadoc/org/eclipse/jetty/util/preventers/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/FileResource.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/JarResource.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/Resource.html
@@ -1379,14 +1391,38 @@ share/jetty/javadoc/org/eclipse/jetty/util/resource/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/util/resource/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/B64Code.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/CertificateUtils.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/CertificateValidator.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/Constraint.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/Credential.Crypt.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/Credential.MD5.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/Credential.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/Password.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/UnixCrypt.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/B64Code.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/CertificateUtils.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/CertificateValidator.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/Constraint.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/Credential.Crypt.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/Credential.MD5.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/Credential.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/Password.html
+share/jetty/javadoc/org/eclipse/jetty/util/security/class-use/UnixCrypt.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/package-summary.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/package-tree.html
 share/jetty/javadoc/org/eclipse/jetty/util/security/package-use.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/AliasedX509ExtendedKeyManager.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/AliasedX509KeyManager.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/SslContextFactory.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/class-use/AliasedX509ExtendedKeyManager.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/class-use/AliasedX509KeyManager.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/class-use/SslContextFactory.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/package-frame.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/package-summary.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/package-tree.html
+share/jetty/javadoc/org/eclipse/jetty/util/ssl/package-use.html
 share/jetty/javadoc/org/eclipse/jetty/util/statistic/CounterStatistic.html
 share/jetty/javadoc/org/eclipse/jetty/util/statistic/SampleStatistic.html
 share/jetty/javadoc/org/eclipse/jetty/util/statistic/class-use/CounterStatistic.html
@@ -1509,14 +1545,14 @@ share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnection.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnectionD00.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnectionD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnectionD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnectionD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketFactory.Acceptor.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketFactory.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGenerator.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGeneratorD00.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGeneratorD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGeneratorD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGeneratorD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketGeneratorRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketHandler.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParser.FrameHandler.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParser.html
@@ -1525,9 +1561,14 @@ share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD06.State.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD08.State.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD13.State.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserRFC6455.State.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketParserRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServlet.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServletConnection.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServletConnectionD00.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServletConnectionD06.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServletConnectionD08.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/WebSocketServletConnectionRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/ZeroMaskGen.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/AbstractExtension.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/DeflateFrameExtension.html
@@ -1551,14 +1592,14 @@ share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnection.ht
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnectionD00.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnectionD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnectionD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnectionD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketConnectionRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketFactory.Acceptor.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketFactory.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGenerator.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGeneratorD00.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGeneratorD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGeneratorD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGeneratorD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketGeneratorRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketHandler.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParser.FrameHandler.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParser.html
@@ -1567,9 +1608,14 @@ share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD06.Sta
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD06.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD08.State.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD08.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD13.State.html
-share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserD13.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserRFC6455.State.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketParserRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServlet.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServletConnection.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServletConnectionD00.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServletConnectionD06.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServletConnectionD08.html
+share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/WebSocketServletConnectionRFC6455.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/class-use/ZeroMaskGen.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/package-frame.html
 share/jetty/javadoc/org/eclipse/jetty/websocket/package-summary.html
@@ -1595,46 +1641,47 @@ share/jetty/javadoc/overview-frame.html
 share/jetty/javadoc/overview-summary.html
 share/jetty/javadoc/overview-tree.html
 share/jetty/javadoc/package-list
-share/jetty/javadoc/resources/inherit.gif
+share/jetty/javadoc/resources/background.gif
+share/jetty/javadoc/resources/tab.gif
+share/jetty/javadoc/resources/titlebar.gif
+share/jetty/javadoc/resources/titlebar_end.gif
 share/jetty/javadoc/serialized-form.html
 share/jetty/javadoc/stylesheet.css
-share/jetty/lib/annotations/javax.annotation_1.0.0.v20100513-0750.jar
-share/jetty/lib/annotations/org.objectweb.asm_3.1.0.v200803061910.jar
+share/jetty/lib/annotations/javax.annotation-1.1.0.v201108011116.jar
+share/jetty/lib/annotations/org.objectweb.asm-3.1.0.v200803061910.jar
 share/jetty/lib/ext/.donotdelete
-share/jetty/lib/jetty-ajp-7.5.4.v20111024.jar
-share/jetty/lib/jetty-all-7.5.4.v20111024-javadoc.jar
-share/jetty/lib/jetty-annotations-7.5.4.v20111024.jar
-share/jetty/lib/jetty-client-7.5.4.v20111024.jar
-share/jetty/lib/jetty-continuation-7.5.4.v20111024.jar
-share/jetty/lib/jetty-deploy-7.5.4.v20111024.jar
-share/jetty/lib/jetty-http-7.5.4.v20111024.jar
-share/jetty/lib/jetty-io-7.5.4.v20111024.jar
-share/jetty/lib/jetty-jmx-7.5.4.v20111024.jar
-share/jetty/lib/jetty-jndi-7.5.4.v20111024.jar
-share/jetty/lib/jetty-overlay-deployer-7.5.4.v20111024.jar
-share/jetty/lib/jetty-plus-7.5.4.v20111024.jar
-share/jetty/lib/jetty-policy-7.5.4.v20111024.jar
-share/jetty/lib/jetty-rewrite-7.5.4.v20111024.jar
-share/jetty/lib/jetty-security-7.5.4.v20111024.jar
-share/jetty/lib/jetty-server-7.5.4.v20111024.jar
-share/jetty/lib/jetty-servlet-7.5.4.v20111024.jar
-share/jetty/lib/jetty-servlets-7.5.4.v20111024.jar
-share/jetty/lib/jetty-util-7.5.4.v20111024.jar
-share/jetty/lib/jetty-webapp-7.5.4.v20111024.jar
-share/jetty/lib/jetty-websocket-7.5.4.v20111024.jar
-share/jetty/lib/jetty-xml-7.5.4.v20111024.jar
-share/jetty/lib/jndi/javax.activation_1.1.0.v201005080500.jar
-share/jetty/lib/jndi/javax.mail.glassfish_1.4.1.v201005082020.jar
-share/jetty/lib/jsp/com.sun.el_1.0.0.v201004190952.jar
-share/jetty/lib/jsp/ecj-3.6.jar
-share/jetty/lib/jsp/javax.el_2.1.0.v201004190952.jar
-share/jetty/lib/jsp/javax.servlet.jsp.jstl_1.2.0.v201004190952.jar
-share/jetty/lib/jsp/javax.servlet.jsp_2.1.0.v201004190952.jar
-share/jetty/lib/jsp/jetty-jsp-2.1-7.5.4.v20111024.jar
-share/jetty/lib/jsp/jsp-impl-2.1.3-b10.jar
-share/jetty/lib/jsp/org.apache.taglibs.standard.glassfish_1.2.0.v201004190952.jar
-share/jetty/lib/jta/javax.transaction_1.1.1.v201004190952.jar
-share/jetty/lib/monitor/jetty-monitor-7.5.4.v20111024.jar
+share/jetty/lib/jetty-ajp-7.6.8.v20121106.jar
+share/jetty/lib/jetty-annotations-7.6.8.v20121106.jar
+share/jetty/lib/jetty-client-7.6.8.v20121106.jar
+share/jetty/lib/jetty-continuation-7.6.8.v20121106.jar
+share/jetty/lib/jetty-deploy-7.6.8.v20121106.jar
+share/jetty/lib/jetty-http-7.6.8.v20121106.jar
+share/jetty/lib/jetty-io-7.6.8.v20121106.jar
+share/jetty/lib/jetty-jmx-7.6.8.v20121106.jar
+share/jetty/lib/jetty-jndi-7.6.8.v20121106.jar
+share/jetty/lib/jetty-overlay-deployer-7.6.8.v20121106.jar
+share/jetty/lib/jetty-plus-7.6.8.v20121106.jar
+share/jetty/lib/jetty-policy-7.6.8.v20121106.jar
+share/jetty/lib/jetty-rewrite-7.6.8.v20121106.jar
+share/jetty/lib/jetty-security-7.6.8.v20121106.jar
+share/jetty/lib/jetty-server-7.6.8.v20121106.jar
+share/jetty/lib/jetty-servlet-7.6.8.v20121106.jar
+share/jetty/lib/jetty-servlets-7.6.8.v20121106.jar
+share/jetty/lib/jetty-util-7.6.8.v20121106.jar
+share/jetty/lib/jetty-webapp-7.6.8.v20121106.jar
+share/jetty/lib/jetty-websocket-7.6.8.v20121106.jar
+share/jetty/lib/jetty-xml-7.6.8.v20121106.jar
+share/jetty/lib/jndi/javax.activation-1.1.0.v201105071233.jar
+share/jetty/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar
+share/jetty/lib/jsp/com.sun.el-1.0.0.v201105211818.jar
+share/jetty/lib/jsp/javax.el-2.1.0.v201105211819.jar
+share/jetty/lib/jsp/javax.servlet.jsp-2.1.0.v201105211820.jar
+share/jetty/lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar
+share/jetty/lib/jsp/org.apache.jasper.glassfish-2.1.0.v201110031002.jar
+share/jetty/lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar
+share/jetty/lib/jsp/org.eclipse.jdt.core-3.7.1.jar
+share/jetty/lib/jta/javax.transaction-1.1.1.v201105210645.jar
+share/jetty/lib/monitor/jetty-monitor-7.6.8.v20121106.jar
 share/jetty/lib/policy/global.policy
 share/jetty/lib/policy/jetty-jmx.policy
 share/jetty/lib/policy/jetty-start.policy
@@ -1642,6 +1689,9 @@ share/jetty/lib/policy/jetty-work.policy
 share/jetty/lib/policy/jetty.policy
 share/jetty/lib/policy/temp-dirs.policy
 share/jetty/lib/servlet-api-2.5.jar
+share/jetty/lib/spdy/spdy-core-7.6.8.v20121106.jar
+share/jetty/lib/spdy/spdy-jetty-7.6.8.v20121106.jar
+share/jetty/lib/spdy/spdy-jetty-http-7.6.8.v20121106.jar
 share/jetty/logs/.donotdelete
 share/jetty/notice.html
 share/jetty/overlays/instances/README.TXT
@@ -1652,4 +1702,5 @@ share/jetty/resources/log4j.properties
 share/jetty/start.ini
 share/jetty/start.jar
 share/jetty/webapps/.donotdelete
+share/jetty/webapps/spdy.war
 share/jetty/webapps/test.war
diff --git a/www/jetty7/distinfo b/www/jetty7/distinfo
index 08291c78efc..bd08d8bcbb9 100644
--- a/www/jetty7/distinfo
+++ b/www/jetty7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/12/15 22:19:11 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/01/03 13:56:13 ryoon Exp $
 
-SHA1 (jetty-distribution-7.5.4.v20111024.tar.gz) = a5007de6f0c81c1b1551fd58f369ce7a2a554216
-RMD160 (jetty-distribution-7.5.4.v20111024.tar.gz) = 0c26a161ea8caa4e0b47ee8614d469021eeccc88
-Size (jetty-distribution-7.5.4.v20111024.tar.gz) = 12304533 bytes
+SHA1 (jetty-distribution-7.6.8.v20121106.tar.gz) = af1baaab04dde6b82366833a0b9e729be5a56a06
+RMD160 (jetty-distribution-7.6.8.v20121106.tar.gz) = 3c83ed6ae84eac00a213cd8ed0fc87b1c9479f9f
+Size (jetty-distribution-7.6.8.v20121106.tar.gz) = 8714368 bytes
diff --git a/www/jetty7/files/jetty.sh b/www/jetty7/files/jetty.sh
index d90fa1d0b48..2f58b1d1a36 100644
--- a/www/jetty7/files/jetty.sh
+++ b/www/jetty7/files/jetty.sh
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: jetty.sh,v 1.2 2011/12/16 17:03:28 ryoon Exp $
+# $NetBSD: jetty.sh,v 1.3 2013/01/03 13:56:14 ryoon Exp $
 #
 # PROVIDE: jetty
 # REQUIRE: DAEMON
@@ -28,10 +28,14 @@ start_precmd="jetty_precmd"
 
 PREFIX=@PREFIX@
 
+JAVA_OPTIONS="-Xmx768M -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch .PollSelectorProvider"
+
 if [ -z "${JAVA_HOME}" ]
 then
 	JAVA_HOME="@JAVA_HOME@"
 	export JAVA_HOME
+	JAVA="@JAVA_HOME@/bin/java"
+	export JAVA
 fi