[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-375-gc7fcb6e

The branch, jetty-9 has been updated
       via  c7fcb6e694bc05d7c81647bdcb4751da0312421e (commit)
      from  502731d7193e02ea14131da7adad090d2072d4af (commit)


- Log -----------------------------------------------------------------
commit c7fcb6e694bc05d7c81647bdcb4751da0312421e
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Thu Jul 5 14:02:21 2012 -0700

    Cleaning up Annotations
    
    + Removing @OnWebSocketText
    + Removing @OnWebSocketBinary
    + Starting to rework EventMethods + WebSocketEventDriver for new
      @OnWebSocketMessage annotation
    + Updating various example/demo/test sockets for this new reality.

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

Summary of changes:
 .../websocket/annotations/OnWebSocketBinary.java   |   31 ---
 .../websocket/annotations/OnWebSocketMessage.java  |   17 ++-
 .../websocket/annotations/OnWebSocketText.java     |   28 ---
 .../eclipse/jetty/websocket/api/EventMethod.java   |   12 -
 .../eclipse/jetty/websocket/api/EventMethods.java  |   37 +---
 .../jetty/websocket/api/EventMethodsCache.java     |  213 ++++++++++----------
 .../org/eclipse/jetty/websocket/api/Frame.java     |   25 +++
 .../websocket/api/WebSocketBlockingConnection.java |  100 +++++++++
 .../jetty/websocket/api/WebSocketEventDriver.java  |   60 +++---
 .../{io => api}/WebSocketOutputStream.java         |    2 +-
 .../websocket/{io => api}/WebSocketWriter.java     |    2 +-
 .../eclipse/jetty/websocket/io/RawConnection.java  |   20 ++
 .../websocket/io/WebSocketAsyncConnection.java     |   15 ++-
 .../websocket/io/WebSocketBlockingConnection.java  |   48 -----
 .../annotations/BadBinarySignatureSocket.java      |    9 +-
 .../annotations/BadDuplicateBinarySocket.java      |   11 +-
 .../annotations/BadTextSignatureSocket.java        |    5 +-
 .../jetty/websocket/annotations/MyEchoSocket.java  |    4 +-
 .../annotations/MyStatelessEchoSocket.java         |    2 +-
 .../jetty/websocket/api/EventMethodsCacheTest.java |   75 ++++----
 .../websocket/api/WebSocketEventDriverTest.java    |    8 +-
 ...Socket.java => AnnotatedBinaryArraySocket.java} |    6 +-
 ...ocket.java => AnnotatedBinaryStreamSocket.java} |   12 +-
 ...teArraySocket.java => AnnotatedTextSocket.java} |    6 +-
 ...rSocket.java => AnnotatedTextStreamSocket.java} |   17 +-
 25 files changed, 392 insertions(+), 373 deletions(-)
 delete mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketBinary.java
 delete mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketText.java
 create mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/Frame.java
 create mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBlockingConnection.java
 rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{io => api}/WebSocketOutputStream.java (85%)
 rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{io => api}/WebSocketWriter.java (92%)
 create mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/RawConnection.java
 delete mode 100644 jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketBlockingConnection.java
 copy jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/api/samples/{AnnotatedByteArraySocket.java => AnnotatedBinaryArraySocket.java} (86%)
 copy jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/api/samples/{AnnotatedByteBufferSocket.java => AnnotatedBinaryStreamSocket.java} (74%)
 rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/api/samples/{AnnotatedByteArraySocket.java => AnnotatedTextSocket.java} (87%)
 rename jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/api/samples/{AnnotatedByteBufferSocket.java => AnnotatedTextStreamSocket.java} (74%)


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