diff --git a/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.png b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.png
new file mode 100644
index 00000000000..b87d721836e
Binary files /dev/null and b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.png differ
diff --git a/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.svg b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.svg
new file mode 100644
index 00000000000..292e7debc12
--- /dev/null
+++ b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.svg
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="645"
+   height="350"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="javax.net.websocket-stack-extensions.svg"
+   inkscape:export-filename="/home/joakim/code/intalio/org.eclipse.jetty9.project/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-extensions.png"
+   inkscape:export-xdpi="111.63"
+   inkscape:export-ydpi="111.63">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3965">
+      <stop
+         style="stop-color:#caf3f6;stop-opacity:1;"
+         offset="0"
+         id="stop3967" />
+      <stop
+         style="stop-color:#caf3f6;stop-opacity:0;"
+         offset="1"
+         id="stop3969" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3965"
+       id="linearGradient3971"
+       x1="250"
+       y1="772.36218"
+       x2="250"
+       y2="927.36218"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.1472868"
+     inkscape:cx="304.93654"
+     inkscape:cy="184.92979"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       dotted="true"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="5px"
+       spacingy="5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Background"
+     sodipodi:insensitive="true">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3089"
+       width="645"
+       height="350"
+       x="0"
+       y="0" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-702.36218)">
+    <rect
+       style="fill:#b9b9b9;fill-opacity:1;stroke:none"
+       id="rect3977"
+       width="560"
+       height="70.000008"
+       x="40.000004"
+       y="957.36218" />
+    <rect
+       y="812.36218"
+       x="40.000004"
+       height="145"
+       width="560"
+       id="rect3975"
+       style="fill:#d1d1d1;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#ececec;fill-opacity:1;stroke:none"
+       id="rect3973"
+       width="560"
+       height="75"
+       x="40.000004"
+       y="737.24573" />
+    <path
+       style="fill:none;stroke:#858585;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 1;stroke-dashoffset:0"
+       d="m 25.000004,812.36217 594.999996,0"
+       id="path3999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g3132"
+       transform="translate(0,79.999997)">
+      <rect
+         y="937.36218"
+         x="50"
+         height="25.000031"
+         width="400"
+         id="rect3008"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3778"
+         y="953.72449"
+         x="249.91454"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="953.72449"
+           x="249.91454"
+           id="tspan3780"
+           sodipodi:role="line">Physical Connection</tspan></text>
+    </g>
+    <g
+       id="g3137"
+       transform="translate(0,29.999997)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3797"
+         width="400"
+         height="25"
+         x="50"
+         y="962.36218" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="249.91455"
+         y="978.72449"
+         id="text3799"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3801"
+           x="249.91455"
+           y="978.72449">AsyncEndPoint</tspan></text>
+    </g>
+    <g
+       id="g3142"
+       transform="translate(0,-20.000003)">
+      <rect
+         y="987.36218"
+         x="50"
+         height="24.999996"
+         width="400"
+         id="rect3805"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3807"
+         y="1003.7245"
+         x="249.91455"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="1003.7245"
+           x="249.91455"
+           id="tspan3809"
+           sodipodi:role="line">WebSocketAsyncConnection</tspan></text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4004"
+       d="m 25.000004,957.36218 594.999996,0"
+       style="fill:none;stroke:#858585;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 1;stroke-dashoffset:0" />
+    <g
+       id="g3152"
+       transform="translate(0,-70.000003)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-opacity:1"
+         id="rect3786"
+         width="200"
+         height="25"
+         x="50"
+         y="1012.3622" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="149.31982"
+         y="1029.8661"
+         id="text3815"
+         sodipodi:linespacing="125%"><tspan
+           id="tspan3822"
+           sodipodi:role="line"
+           x="149.31982"
+           y="1029.8661">Parser</tspan></text>
+    </g>
+    <g
+       id="g3147"
+       transform="translate(0,-70.000003)">
+      <rect
+         y="1012.3622"
+         x="250"
+         height="25"
+         width="200"
+         id="rect3788"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3826"
+         y="1029.9584"
+         x="314.03955"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           id="tspan3830"
+           y="1029.9584"
+           x="314.03955"
+           sodipodi:role="line">Generator</tspan></text>
+    </g>
+    <g
+       id="g3954"
+       transform="translate(-0.0854492,38.643061)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3849"
+         width="400"
+         height="25"
+         x="50.085449"
+         y="710.99988" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="250"
+         y="727.36218"
+         id="text3851"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3853"
+           x="250"
+           y="727.36218">WebSocketEndPoint</tspan></text>
+    </g>
+    <g
+       id="g3949"
+       transform="translate(-0.0854492,-36.356939)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3865"
+         width="400"
+         height="25"
+         x="50.085449"
+         y="760.99988" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="250"
+         y="777.36218"
+         id="text3867"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3869"
+           x="250"
+           y="777.36218">WebSocket Object</tspan></text>
+    </g>
+    <rect
+       style="fill:url(#linearGradient3971);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+       id="rect3961"
+       width="400"
+       height="152.71928"
+       x="50"
+       y="774.64294" />
+    <rect
+       style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.90829504;stroke-opacity:1"
+       id="rect3881"
+       width="164.99998"
+       height="25"
+       x="60"
+       y="799.64294" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="136.81982"
+       y="817.36218"
+       id="text3883"
+       sodipodi:linespacing="125%"><tspan
+         id="tspan3885"
+         sodipodi:role="line"
+         x="136.81982"
+         y="817.36218">EventDriver</tspan></text>
+    <rect
+       y="799.64294"
+       x="229.99998"
+       height="25"
+       width="209.99998"
+       id="rect3905"
+       style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1.03682196;stroke-opacity:1" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3907"
+       y="817.36218"
+       x="334.93845"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       xml:space="preserve"><tspan
+         y="817.36218"
+         x="334.93845"
+         sodipodi:role="line"
+         id="tspan3909">WebSocketRemoteEndpoint</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="249.91455"
+       y="791.00525"
+       id="text3963"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3965"
+         x="249.91455"
+         y="791.00525">WebSocketSession</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="484.2207"
+       y="987.36218"
+       id="text3979"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3981"
+         x="484.2207"
+         y="987.36218">Network</tspan><tspan
+         sodipodi:role="line"
+         x="484.2207"
+         y="1002.3622"
+         id="tspan3983">ByteBuffers</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="485"
+       y="847.36218"
+       id="text3985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3987"
+         x="485"
+         y="847.36218">Internal</tspan><tspan
+         sodipodi:role="line"
+         x="485"
+         y="862.36218"
+         id="tspan3989">WebSocketFrame</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="485.43359"
+       y="762.36218"
+       id="text3991"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3993"
+         x="485.43359"
+         y="762.36218">Message</tspan><tspan
+         sodipodi:role="line"
+         x="485.43359"
+         y="777.36218"
+         id="tspan3995">Text or Binary</tspan></text>
+    <rect
+       style="fill:#e84400;fill-opacity:1;stroke:none"
+       id="rect4032"
+       width="65.063103"
+       height="11.709856"
+       x="414.50586"
+       y="757.07648"
+       ry="5.854928" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="421.08868"
+       y="766.78979"
+       id="text4034"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="421.08868"
+         y="766.78979"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">EndPoint</tspan></text>
+    <rect
+       ry="5.854928"
+       y="781.06757"
+       x="418.32745"
+       height="11.709856"
+       width="59.474655"
+       id="rect4045"
+       style="fill:#e84400;fill-opacity:1;stroke:none" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4047"
+       y="790.78094"
+       x="425.44174"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+         y="790.78094"
+         x="425.44174"
+         id="tspan4049"
+         sodipodi:role="line">Session</tspan></text>
+    <g
+       id="g3979"
+       transform="translate(-6.9855596,-6.0541516)">
+      <rect
+         ry="5.854928"
+         y="804.20941"
+         x="439.77084"
+         height="11.709856"
+         width="103.94939"
+         id="rect4053"
+         style="fill:#e84400;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4055"
+         y="813.92279"
+         x="446.44672"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+           y="813.92279"
+           x="446.44672"
+           id="tspan4057"
+           sodipodi:role="line">RemoteEndpoint</tspan></text>
+    </g>
+    <g
+       id="g4070"
+       transform="translate(3.6030325,-99.6839)">
+      <rect
+         ry="5.854928"
+         y="921.58582"
+         x="85.647453"
+         height="11.709856"
+         width="88.274292"
+         id="rect4061"
+         style="fill:#e84400;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4063"
+         y="931.29919"
+         x="90.723061"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+           y="931.29919"
+           x="90.723061"
+           id="tspan4065"
+           sodipodi:role="line">FrameHandler</tspan></text>
+    </g>
+    <g
+       transform="translate(228.00221,11.948808)"
+       id="g4075">
+      <rect
+         style="fill:#e84400;fill-opacity:1;stroke:none"
+         id="rect4077"
+         width="88.274292"
+         height="11.709856"
+         x="85.647453"
+         y="921.58582"
+         ry="5.854928" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="90.723061"
+         y="931.29919"
+         id="text4079"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan4081"
+           x="90.723061"
+           y="931.29919"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">FrameHandler</tspan></text>
+    </g>
+    <rect
+       ry="5.854928"
+       y="780.36169"
+       x="59.872288"
+       height="11.709856"
+       width="107.44216"
+       id="rect4112"
+       style="fill:#e84400;fill-opacity:1;stroke:none" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4114"
+       y="790.07501"
+       x="66.455116"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+         y="790.07501"
+         x="66.455116"
+         id="tspan4116"
+         sodipodi:role="line">MessageHandler</tspan></text>
+    <rect
+       style="fill:#e84400;fill-opacity:1;stroke:none"
+       id="rect4118"
+       width="63.665989"
+       height="11.709856"
+       x="328.81635"
+       y="780.59454"
+       ry="5.854928" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="337.85223"
+       y="790.30786"
+       id="text4120"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4122"
+         x="337.85223"
+         y="790.30786"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">Encoder</tspan></text>
+    <g
+       id="g3856"
+       transform="translate(-0.81398971,4.1913356)">
+      <rect
+         y="848.0545"
+         x="191.13927"
+         height="25"
+         width="112.82959"
+         id="rect3072"
+         style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.53110641;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3074"
+         y="865.77374"
+         x="247.57115"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="865.77374"
+           x="247.57115"
+           id="tspan3076"
+           sodipodi:role="line">Extension 2</tspan></text>
+    </g>
+    <rect
+       y="841.53467"
+       x="72.885246"
+       height="25"
+       width="129.32132"
+       id="rect3850"
+       style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.56859767;stroke-opacity:1" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3852"
+       y="857.89697"
+       x="126.25812"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       xml:space="preserve"><tspan
+         y="857.89697"
+         x="126.25812"
+         id="tspan3854"
+         sodipodi:role="line">Incoming</tspan></text>
+    <rect
+       style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.56353527;stroke-opacity:1"
+       id="rect3861"
+       width="127.02879"
+       height="25"
+       x="295.69891"
+       y="860.62854" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="370.28702"
+       y="876.99084"
+       id="text3863"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3865"
+         x="370.28702"
+         y="876.99084">Outgoing</tspan></text>
+    <g
+       transform="translate(-0.81398971,41.913358)"
+       id="g3877">
+      <rect
+         style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.53110641;stroke-opacity:1"
+         id="rect3879"
+         width="112.82959"
+         height="25"
+         x="191.13927"
+         y="848.0545" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="247.57115"
+         y="865.77374"
+         id="text3881"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3883"
+           x="247.57115"
+           y="865.77374">Extension 1</tspan></text>
+    </g>
+    <rect
+       style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.56359768;stroke-opacity:1"
+       id="rect3887"
+       width="127.05691"
+       height="25"
+       x="75.149658"
+       y="879.25665" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="126.25812"
+       y="895.61896"
+       id="text3889"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3891"
+         x="126.25812"
+         y="895.61896">Incoming</tspan></text>
+    <rect
+       y="898.35059"
+       x="295.69891"
+       height="25"
+       width="125.62177"
+       id="rect3895"
+       style="fill:#f6f4ca;fill-opacity:1;stroke:#000000;stroke-width:0.56040561;stroke-opacity:1" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3897"
+       y="914.71289"
+       x="370.28702"
+       style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       xml:space="preserve"><tspan
+         y="914.71289"
+         x="370.28702"
+         id="tspan3899"
+         sodipodi:role="line">Outgoing</tspan></text>
+    <g
+       id="g3925"
+       transform="matrix(-1,0,0,-1,156.93219,1775.5293)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3934"
+         d="m 75.000004,817.36217 0,137.3125 -7.65625,0 17.65625,17.6875 17.687496,-17.6875 -7.687496,0 0,-137.3125 -20,0 z"
+         style="fill:#f7d1d1;fill-opacity:1;stroke:#dd9191;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         transform="matrix(0,1,-1,0,0,0)"
+         sodipodi:linespacing="125%"
+         id="text3948"
+         y="-81.15332"
+         x="822.36218"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="-81.15332"
+           x="822.36218"
+           id="tspan3950"
+           sodipodi:role="line">IncomingFrames</tspan></text>
+    </g>
+    <g
+       id="g3930"
+       transform="matrix(-1,0,0,-1,842.97235,1773.7812)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3954"
+         d="m 420,817.36217 -17.6875,17.6875 7.6875,0 0,117.3125 20,0 0,-117.3125 7.65625,0 L 420,817.36217 z"
+         style="fill:#f7d1d1;fill-opacity:1;stroke:#dd9191;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="-942.64636"
+         y="423.84668"
+         id="text3969"
+         sodipodi:linespacing="125%"
+         transform="matrix(0,-1,1,0,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan3971"
+           x="-942.64636"
+           y="423.84668">OutgoingFrames</tspan></text>
+    </g>
+    <g
+       transform="translate(3.6030325,-60.564766)"
+       id="g3901">
+      <rect
+         style="fill:#e84400;fill-opacity:1;stroke:none"
+         id="rect3903"
+         width="88.274292"
+         height="11.709856"
+         x="85.647453"
+         y="921.58582"
+         ry="5.854928" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="90.723061"
+         y="931.29919"
+         id="text3905"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3907"
+           x="90.723061"
+           y="931.29919"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">FrameHandler</tspan></text>
+    </g>
+    <g
+       id="g3909"
+       transform="translate(3.6030325,-20.979928)">
+      <rect
+         ry="5.854928"
+         y="921.58582"
+         x="85.647453"
+         height="11.709856"
+         width="88.274292"
+         id="rect3911"
+         style="fill:#e84400;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3913"
+         y="931.29919"
+         x="90.723061"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+           y="931.29919"
+           x="90.723061"
+           id="tspan3915"
+           sodipodi:role="line">FrameHandler</tspan></text>
+    </g>
+    <g
+       id="g3917"
+       transform="translate(228.00221,-31.827366)">
+      <rect
+         ry="5.854928"
+         y="921.58582"
+         x="85.647453"
+         height="11.709856"
+         width="88.274292"
+         id="rect3919"
+         style="fill:#e84400;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3921"
+         y="931.29919"
+         x="90.723061"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+           y="931.29919"
+           x="90.723061"
+           id="tspan3923"
+           sodipodi:role="line">FrameHandler</tspan></text>
+    </g>
+    <g
+       transform="translate(228.00221,-69.549388)"
+       id="g3926">
+      <rect
+         style="fill:#e84400;fill-opacity:1;stroke:none"
+         id="rect3928"
+         width="88.274292"
+         height="11.709856"
+         x="85.647453"
+         y="921.58582"
+         ry="5.854928" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="90.723061"
+         y="931.29919"
+         id="text3930"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3932"
+           x="90.723061"
+           y="931.29919"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">FrameHandler</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.png b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.png
new file mode 100644
index 00000000000..1268ca33581
Binary files /dev/null and b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.png differ
diff --git a/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.svg b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.svg
new file mode 100644
index 00000000000..39904d1cc59
--- /dev/null
+++ b/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.svg
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="645"
+   height="350"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="javax.net.websocket-stack-simple.svg"
+   inkscape:export-filename="/home/joakim/code/intalio/org.eclipse.jetty9.project/jetty-websocket/websocket-common/src/main/javadoc/org/eclipse/jetty/websocket/doc-files/javax.net.websocket-stack-simple.png"
+   inkscape:export-xdpi="111.63"
+   inkscape:export-ydpi="111.63">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.1472868"
+     inkscape:cx="290.96542"
+     inkscape:cy="172.35578"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       dotted="true"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="5px"
+       spacingy="5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Background"
+     sodipodi:insensitive="true">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3089"
+       width="645"
+       height="350"
+       x="0"
+       y="0" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-702.36218)">
+    <rect
+       style="fill:#b9b9b9;fill-opacity:1;stroke:none"
+       id="rect3977"
+       width="560"
+       height="70.000008"
+       x="40.000004"
+       y="957.36218" />
+    <rect
+       y="812.36218"
+       x="40.000004"
+       height="145"
+       width="560"
+       id="rect3975"
+       style="fill:#d1d1d1;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#ececec;fill-opacity:1;stroke:none"
+       id="rect3973"
+       width="560"
+       height="75"
+       x="40.000004"
+       y="737.24573" />
+    <path
+       style="fill:none;stroke:#858585;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 1;stroke-dashoffset:0"
+       d="m 25.000004,812.36217 594.999996,0"
+       id="path3999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g3132"
+       transform="translate(0,79.999997)">
+      <rect
+         y="937.36218"
+         x="50"
+         height="25.000031"
+         width="400"
+         id="rect3008"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3778"
+         y="953.72449"
+         x="249.91454"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="953.72449"
+           x="249.91454"
+           id="tspan3780"
+           sodipodi:role="line">Physical Connection</tspan></text>
+    </g>
+    <g
+       id="g3137"
+       transform="translate(0,29.999997)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3797"
+         width="400"
+         height="25"
+         x="50"
+         y="962.36218" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="249.91455"
+         y="978.72449"
+         id="text3799"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3801"
+           x="249.91455"
+           y="978.72449">AsyncEndPoint</tspan></text>
+    </g>
+    <g
+       id="g3142"
+       transform="translate(0,-20.000003)">
+      <rect
+         y="987.36218"
+         x="50"
+         height="24.999996"
+         width="400"
+         id="rect3805"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3807"
+         y="1003.7245"
+         x="249.91455"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="1003.7245"
+           x="249.91455"
+           id="tspan3809"
+           sodipodi:role="line">WebSocketAsyncConnection</tspan></text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4004"
+       d="m 25.000004,957.36218 594.999996,0"
+       style="fill:none;stroke:#858585;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:4, 1;stroke-dashoffset:0" />
+    <g
+       id="g3152"
+       transform="translate(0,-70.000003)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-opacity:1"
+         id="rect3786"
+         width="200"
+         height="25"
+         x="50"
+         y="1012.3622" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="149.31982"
+         y="1029.8661"
+         id="text3815"
+         sodipodi:linespacing="125%"><tspan
+           id="tspan3822"
+           sodipodi:role="line"
+           x="149.31982"
+           y="1029.8661">Parser</tspan></text>
+    </g>
+    <g
+       id="g3147"
+       transform="translate(0,-70.000003)">
+      <rect
+         y="1012.3622"
+         x="250"
+         height="25"
+         width="200"
+         id="rect3788"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3826"
+         y="1029.9584"
+         x="314.03955"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           id="tspan3830"
+           y="1029.9584"
+           x="314.03955"
+           sodipodi:role="line">Generator</tspan></text>
+    </g>
+    <g
+       id="g3954"
+       transform="translate(-0.0854492,38.643061)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3849"
+         width="400"
+         height="25"
+         x="50.085449"
+         y="710.99988" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="250"
+         y="727.36218"
+         id="text3851"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3853"
+           x="250"
+           y="727.36218">WebSocketEndPoint</tspan></text>
+    </g>
+    <g
+       id="g3949"
+       transform="translate(-0.0854492,-36.356939)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1"
+         id="rect3865"
+         width="400"
+         height="25"
+         x="50.085449"
+         y="760.99988" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="250"
+         y="777.36218"
+         id="text3867"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3869"
+           x="250"
+           y="777.36218">WebSocket Object</tspan></text>
+    </g>
+    <g
+       id="g3973"
+       transform="translate(0,17.280759)">
+      <rect
+         y="782.36218"
+         x="49.999996"
+         height="25"
+         width="175"
+         id="rect3881"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:0.93541425;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3883"
+         y="800.08142"
+         x="136.81982"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="800.08142"
+           x="136.81982"
+           sodipodi:role="line"
+           id="tspan3885">EventDriver</tspan></text>
+    </g>
+    <g
+       id="g3978"
+       transform="translate(0,17.280759)">
+      <rect
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1.06066012;stroke-opacity:1"
+         id="rect3905"
+         width="225"
+         height="25"
+         x="225"
+         y="782.36218" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="337.43848"
+         y="798.72449"
+         id="text3907"
+         sodipodi:linespacing="125%"><tspan
+           id="tspan3909"
+           sodipodi:role="line"
+           x="337.43848"
+           y="798.72449">WebSocketRemoteEndpoint</tspan></text>
+    </g>
+    <g
+       transform="translate(-0.0854492,63.643061)"
+       id="g3959">
+      <rect
+         y="710.99988"
+         x="50.085449"
+         height="25"
+         width="400"
+         id="rect3961"
+         style="fill:#caf3f6;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3963"
+         y="727.36218"
+         x="250"
+         style="font-size:14px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="727.36218"
+           x="250"
+           id="tspan3965"
+           sodipodi:role="line">WebSocketSession</tspan></text>
+    </g>
+    <g
+       id="g3930"
+       transform="matrix(-1,0,0,-1,842.97235,1773.7812)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3954"
+         d="m 420,817.36217 -17.6875,17.6875 7.6875,0 0,117.3125 20,0 0,-117.3125 7.65625,0 L 420,817.36217 z"
+         style="fill:#f7d1d1;fill-opacity:1;stroke:#dd9191;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         x="-942.64636"
+         y="423.84668"
+         id="text3969"
+         sodipodi:linespacing="125%"
+         transform="matrix(0,-1,1,0,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan3971"
+           x="-942.64636"
+           y="423.84668">OutgoingFrames</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="484.2207"
+       y="987.36218"
+       id="text3979"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3981"
+         x="484.2207"
+         y="987.36218">Network</tspan><tspan
+         sodipodi:role="line"
+         x="484.2207"
+         y="1002.3622"
+         id="tspan3983">ByteBuffers</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="485"
+       y="847.36218"
+       id="text3985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3987"
+         x="485"
+         y="847.36218">Internal</tspan><tspan
+         sodipodi:role="line"
+         x="485"
+         y="862.36218"
+         id="tspan3989">WebSocketFrame</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="485.43359"
+       y="762.36218"
+       id="text3991"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3993"
+         x="485.43359"
+         y="762.36218">Message</tspan><tspan
+         sodipodi:role="line"
+         x="485.43359"
+         y="777.36218"
+         id="tspan3995">Text or Binary</tspan></text>
+    <rect
+       style="fill:#e84400;fill-opacity:1;stroke:none"
+       id="rect4032"
+       width="65.063103"
+       height="11.709856"
+       x="414.50586"
+       y="757.07648"
+       ry="5.854928" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="421.08868"
+       y="766.78979"
+       id="text4034"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="421.08868"
+         y="766.78979"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">EndPoint</tspan></text>
+    <rect
+       ry="5.854928"
+       y="781.06757"
+       x="418.32745"
+       height="11.709856"
+       width="59.474655"
+       id="rect4045"
+       style="fill:#e84400;fill-opacity:1;stroke:none" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4047"
+       y="790.78094"
+       x="425.44174"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+         y="790.78094"
+         x="425.44174"
+         id="tspan4049"
+         sodipodi:role="line">Session</tspan></text>
+    <rect
+       style="fill:#e84400;fill-opacity:1;stroke:none"
+       id="rect4053"
+       width="103.94939"
+       height="11.709856"
+       x="439.77084"
+       y="804.20941"
+       ry="5.854928" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="446.44672"
+       y="813.92279"
+       id="text4055"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4057"
+         x="446.44672"
+         y="813.92279"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">RemoteEndpoint</tspan></text>
+    <g
+       id="g4070"
+       transform="translate(3.6030325,-99.6839)">
+      <rect
+         ry="5.854928"
+         y="921.58582"
+         x="85.647453"
+         height="11.709856"
+         width="88.274292"
+         id="rect4061"
+         style="fill:#e84400;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4063"
+         y="931.29919"
+         x="90.723061"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+           y="931.29919"
+           x="90.723061"
+           id="tspan4065"
+           sodipodi:role="line">FrameHandler</tspan></text>
+    </g>
+    <g
+       id="g3925"
+       transform="matrix(-1,0,0,-1,156.93219,1775.5293)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3934"
+         d="m 75.000004,817.36217 0,137.3125 -7.65625,0 17.65625,17.6875 17.687496,-17.6875 -7.687496,0 0,-137.3125 -20,0 z"
+         style="fill:#f7d1d1;fill-opacity:1;stroke:#dd9191;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         transform="matrix(0,1,-1,0,0,0)"
+         sodipodi:linespacing="125%"
+         id="text3948"
+         y="-81.15332"
+         x="822.36218"
+         style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="-81.15332"
+           x="822.36218"
+           id="tspan3950"
+           sodipodi:role="line">IncomingFrames</tspan></text>
+    </g>
+    <g
+       transform="translate(220.08524,13.811624)"
+       id="g4075">
+      <rect
+         style="fill:#e84400;fill-opacity:1;stroke:none"
+         id="rect4077"
+         width="88.274292"
+         height="11.709856"
+         x="85.647453"
+         y="921.58582"
+         ry="5.854928" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="90.723061"
+         y="931.29919"
+         id="text4079"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan4081"
+           x="90.723061"
+           y="931.29919"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">FrameHandler</tspan></text>
+    </g>
+    <rect
+       ry="5.854928"
+       y="780.36169"
+       x="59.872288"
+       height="11.709856"
+       width="107.44216"
+       id="rect4112"
+       style="fill:#e84400;fill-opacity:1;stroke:none" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4114"
+       y="790.07501"
+       x="66.455116"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono"
+         y="790.07501"
+         x="66.455116"
+         id="tspan4116"
+         sodipodi:role="line">MessageHandler</tspan></text>
+    <rect
+       style="fill:#e84400;fill-opacity:1;stroke:none"
+       id="rect4118"
+       width="63.665989"
+       height="11.709856"
+       x="328.81635"
+       y="780.59454"
+       ry="5.854928" />
+    <text
+       xml:space="preserve"
+       style="font-size:10.80251503px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="337.85223"
+       y="790.30786"
+       id="text4120"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4122"
+         x="337.85223"
+         y="790.30786"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Droid Sans Mono;-inkscape-font-specification:Droid Sans Mono">Encoder</tspan></text>
+  </g>
+</svg>