diff options
author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
---|---|---|
committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
commit | fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch) | |
tree | 928419d6bfe794865e4b8f0634bd792f795c4b8a /trunk/infrastructure/net.appjet.oui/network.scala | |
parent | 0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff) | |
parent | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff) | |
download | etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip |
Merge branch 'master' into plugin-framework
Diffstat (limited to 'trunk/infrastructure/net.appjet.oui/network.scala')
-rw-r--r-- | trunk/infrastructure/net.appjet.oui/network.scala | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/trunk/infrastructure/net.appjet.oui/network.scala b/trunk/infrastructure/net.appjet.oui/network.scala deleted file mode 100644 index 2965b19..0000000 --- a/trunk/infrastructure/net.appjet.oui/network.scala +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.appjet.oui; - -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.security.{SslSelectChannelConnector, SslHttpChannelEndPoint}; -import org.mortbay.io.nio.SelectorManager; -import org.mortbay.io.Buffers; -import javax.net.ssl.SSLEngine; - -import java.nio.channels.{SocketChannel, SelectionKey}; - -trait KnowsAboutDispatch extends SelectChannelConnector.ConnectorEndPoint { - def isDispatched: Boolean; -} - -class CometConnectorEndPoint(channel: SocketChannel, selectSet: SelectorManager#SelectSet, key: SelectionKey) - extends SelectChannelConnector.ConnectorEndPoint(channel, selectSet, key) with KnowsAboutDispatch { - def isDispatched = _dispatched; -} - -class CometSelectChannelConnector extends SelectChannelConnector { - override def newEndPoint(channel: SocketChannel, selectSet: SelectorManager#SelectSet, key: SelectionKey) = - new CometConnectorEndPoint(channel, selectSet, key); -} - -class CometSslHttpChannelEndPoint(buffers: Buffers, channel: SocketChannel, selectSet: SelectorManager#SelectSet, - key: SelectionKey, engine: SSLEngine) - extends SslHttpChannelEndPoint(buffers, channel, selectSet, key, engine) with KnowsAboutDispatch { - def isDispatched = _dispatched; -} - -class CometSslSelectChannelConnector extends SslSelectChannelConnector { - override def newEndPoint(channel: SocketChannel, selectSet: SelectorManager#SelectSet, key: SelectionKey) = - new CometSslHttpChannelEndPoint(this, channel, selectSet, key, createSSLEngine()); -} |