You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/03/07 19:26:19 UTC

[09/50] incubator-quarks git commit: Merge pull request #90 from dlaboss/wsclient-wss

Merge pull request #90 from dlaboss/wsclient-wss

Wsclient full wss (SSL) support

Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/a894c9c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/a894c9c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/a894c9c9

Branch: refs/heads/master
Commit: a894c9c902aceddac54eca62d32a405ee58def07
Parents: 57d3082 75107e6
Author: Dale LaBossiere <dl...@users.noreply.github.com>
Authored: Fri Mar 4 10:59:24 2016 -0500
Committer: Dale LaBossiere <dl...@users.noreply.github.com>
Committed: Fri Mar 4 10:59:24 2016 -0500

----------------------------------------------------------------------
 build.xml                                       |   3 +-
 common-build.xml                                |   5 +-
 connectors/.classpath                           |   7 +-
 connectors/javax.websocket-client/README        |   3 +
 connectors/javax.websocket-client/build.xml     |   1 +
 .../javax.websocket-client/src/main/java/Dummy  |   1 -
 .../impl/QuarksSslContainerProviderImpl.java    |  66 +++
 .../javax/websocket/impl/package-info.java      |   8 +
 ...s.javax.websocket.QuarksSslContainerProvider |   1 +
 connectors/javax.websocket-server/README        |   6 +-
 connectors/javax.websocket-server/build.xml     |   1 +
 .../ext/jetty-util-9.3.6.v20151106.jar          | Bin 413963 -> 0 bytes
 connectors/quarks.javax.websocket/build.xml     |  29 +
 connectors/quarks.javax.websocket/ext/README    |   1 +
 .../ext/javax.websocket-api-1.0.jar             | Bin 0 -> 36611 bytes
 .../ext/license-eplv10-aslv20.html              | 576 +++++++++++++++++++
 .../quarks.javax.websocket/ext/notice.html      | 111 ++++
 .../websocket/QuarksSslContainerProvider.java   |  62 ++
 .../quarks/javax/websocket/package-info.java    |   8 +
 .../quarks.javax.websocket/src/test/java/Dummy  |   1 +
 connectors/wsclient-javax.websocket/build.xml   |   1 +
 connectors/wsclient-javax.websocket/ext/README  |   1 -
 .../ext/javax.websocket-api-1.0.jar             | Bin 36611 -> 0 bytes
 .../ext/license-eplv10-aslv20.html              | 576 -------------------
 .../wsclient-javax.websocket/ext/notice.html    | 111 ----
 .../javax/websocket/Jsr356WebSocketClient.java  |  51 +-
 .../runtime/WebSocketClientConnector.java       |  67 ++-
 .../wsclient-javax.websocket/src/test/Dummy     |   1 +
 .../src/test/java/Dummy                         |   1 -
 .../wsclient/javax/websocket/KeystorePath.java  |  26 +
 .../javax/websocket/WebSocketClientTest.java    | 373 +++++++++++-
 .../javax/websocket/WebSocketServerEcho.java    |  90 ++-
 .../src/test/keystores/README                   | 111 ++++
 .../src/test/keystores/clientKeyStore.jks       | Bin 0 -> 6657 bytes
 .../src/test/keystores/clientTrustStore.jks     | Bin 0 -> 947 bytes
 .../src/test/keystores/serverKeyStore.jks       | Bin 0 -> 2236 bytes
 .../src/test/keystores/serverTrustStore.jks     | Bin 0 -> 1868 bytes
 .../connectors/wsclient/WebSocketClient.java    |  19 +-
 38 files changed, 1549 insertions(+), 769 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/a894c9c9/build.xml
----------------------------------------------------------------------