[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-9 updated. jetty-8.1.0.v20120127-233-gc0d92ce

The branch, jetty-9 has been updated
       via  c0d92cebd76964d66348aac142b07ca5f6293f10 (commit)
       via  a718d30a6735230aa76d0149fae9246e748c6ce7 (commit)
       via  2c26326998b2df9cc3d31b2d86f2dcb5e250abfe (commit)
      from  8bab5beb2ba400e375324c6a9b163a8008f975e4 (commit)


- Log -----------------------------------------------------------------
commit c0d92cebd76964d66348aac142b07ca5f6293f10
Merge: a718d30 8bab5be
Author: Jesse McConnell <jesse.mcconnell@xxxxxxxxx>
Date:   Tue Jun 19 17:27:14 2012 -0500

    Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

commit a718d30a6735230aa76d0149fae9246e748c6ce7
Author: Jesse McConnell <jesse.mcconnell@xxxxxxxxx>
Date:   Tue Jun 19 17:27:02 2012 -0500

    gettings settings down into generator, not sure this is right for masking or not yet

commit 2c26326998b2df9cc3d31b2d86f2dcb5e250abfe
Author: Jesse McConnell <jesse.mcconnell@xxxxxxxxx>
Date:   Tue Jun 19 17:26:17 2012 -0500

    gettings settings down into generator, not sure this is right for masking or not yet

-----------------------------------------------------------------------

Summary of changes:
 .../jetty/websocket/api/WebSocketSettings.java     |   18 +++++
 .../websocket/generator/CloseFrameGenerator.java   |    5 +-
 .../jetty/websocket/generator/FrameGenerator.java  |   10 +++-
 .../jetty/websocket/generator/Generator.java       |   16 +++--
 .../websocket/generator/PingFrameGenerator.java    |    5 +-
 .../websocket/generator/PongFrameGenerator.java    |    5 +-
 .../generator/RFC6455ExamplesGeneratorTest.java    |   75 ++++++++++++++++++++
 7 files changed, 120 insertions(+), 14 deletions(-)
 create mode 100644 jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/generator/RFC6455ExamplesGeneratorTest.java


hooks/post-receive
-- 
Jetty: primary project repository