Commit Graph

511 Commits

Author SHA1 Message Date
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt 67cccd610a Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket 2017-06-26 13:11:33 -07:00
Joakim Erdfelt a1d65325fc No more websocket test errors (need to work on issues) 2017-06-26 11:59:38 -07:00
Joakim Erdfelt e3f1fb4bde Fixing javadoc error 2017-06-26 11:59:37 -07:00
Joakim Erdfelt a8503a2932 Issue #207 - removing scheduler 2017-06-26 11:59:34 -07:00
Joakim Erdfelt ae2bda4dc8 Post-merge cleanup 2017-06-26 11:59:33 -07:00
Joakim Erdfelt 644c14253d Issue #207 - better client connect/upgrade error handling 2017-06-26 11:59:27 -07:00
Joakim Erdfelt 55fd254161 Issue #207 - All websocket tests moved to /websocket-tests/ module
# Conflicts:
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
2017-06-26 11:59:09 -07:00
Joakim Erdfelt d43c8e7776 Issue #207 - MessageOutputStream fix 2017-06-26 11:57:26 -07:00
Joakim Erdfelt 5ab7bf37b2 Issue #207 - websocket-client test cleanup 2017-06-26 11:53:27 -07:00
Joakim Erdfelt 2bab817c6b Issue #207 - common test cleanup 2017-06-26 11:53:26 -07:00
Joakim Erdfelt 9fd70d3d6f Issue #207 - more test failure fixes 2017-06-26 11:53:25 -07:00
Joakim Erdfelt 8e889287fa Issue #207 - Final removal of BlockheadClient
# Conflicts:
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/XBlockheadClient.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RequestHeadersTest.java
2017-06-26 11:52:46 -07:00
Joakim Erdfelt e4790fea72 Issue #207 - Removing BlockheadServer 2017-06-26 11:51:51 -07:00
Joakim Erdfelt 06f204f794 Issue #207 - moved client tests to websocket-tests
# Conflicts:
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java
2017-06-26 11:50:54 -07:00
Joakim Erdfelt 36f40689cc Issue #207 - websocket-common test fixes 2017-06-26 11:50:12 -07:00
Joakim Erdfelt 5e8a7078eb Issue #207 - more testing updates 2017-06-26 11:50:10 -07:00
Joakim Erdfelt dddf066e90 Issue #207 - Simplifying Connection and Close states
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
  low level Connection handling, with little to none websocket
  specifics.
+ WebSocketSession simplified
2017-06-26 11:50:08 -07:00
Joakim Erdfelt fcb8693c52 Issue #207 - testcase rework due to new async behaviors
# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
2017-06-26 11:49:53 -07:00
Joakim Erdfelt 38fefa6471 Issue #207 - Improved Error Handling 2017-06-26 11:43:24 -07:00
Joakim Erdfelt b93925e03e Issue #207 - more work on policy / buffer behaviors 2017-06-26 11:43:21 -07:00
Joakim Erdfelt fa10576bc6 Issue #207 - initial pass through for Stream backpressure 2017-06-26 11:43:18 -07:00
Joakim Erdfelt 9ffb266ccb Issue #207 - Support javax.websocket version 1.1
+ Cleaning up WebSocketPolicy usage

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java
2017-06-26 11:28:45 -07:00
Joakim Erdfelt 56abb626a4 Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
2017-06-26 10:57:05 -07:00
Joakim Erdfelt cd15a57a5e Issue #207 - Support javax.websocket version 1.1
WIP

# Conflicts:
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectPromise.java
2017-06-26 10:56:45 -07:00
Joakim Erdfelt 3906f9595f 467246 - Support javax.websocket version 1.1
+ WIP
2017-06-26 10:55:04 -07:00
Joakim Erdfelt 9e0fd7faa0 Issue #1625 - Support new IANA declared websocket close status codes 2017-06-16 14:23:29 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt e3bab3df22 Issue #1528 - Use WebSocketContainer out of current context
+ Interrogate ServletContext, ContextHandler, and Context
  for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
Joakim Erdfelt e001fe0355 Issue #1528 - pull preconfigured HttpClient from attributes
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
Joakim Erdfelt 75101dfa0c Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
+ Will use XML resource (if jetty-xml is present, and resource found)
  to load the HttpClient configuration that should be used by the
  new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
Joakim Erdfelt c75e3c19d9 Issue #1516 - making WebSocket started thread pools have identifying names 2017-05-11 09:52:02 -07:00
Joakim Erdfelt a7b164e6b9 Fixing JSR356 Client tests 2017-05-10 07:46:56 -07:00
Joakim Erdfelt 753ed9e603 Issue #1516 - Delay starting of WebSocketClient 2017-05-09 12:58:22 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt 01d539e2be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 14:20:19 -07:00
Joakim Erdfelt 1eeac2af6b Fixing test 2017-03-09 14:17:05 -07:00
Greg Wilkins 64c2529fb9 fixed merge 2017-03-06 15:00:14 +11:00
Greg Wilkins 0a2da4822d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-06 14:20:23 +11:00
Joakim Erdfelt 11b6e8ab49 Issue #609 - fixing testcase 2017-03-01 09:57:23 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00