Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,125 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

572 Commits

Author SHA1 Message Date
Simone Bordet bce20d1b2e Merged branch 'jetty-9.4.x' into 'master'. 2017-09-04 15:57:01 +02:00
Joakim Erdfelt 02f0649840 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-28 11:33:12 -07:00
Lucas Fairchild-Madar b24c4e1a8a further match coding style 2017-08-25 12:36:48 -07:00
Lucas Fairchild-Madar 84ff1e3a66 Matching coding style; block potential race condition 
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
 2017-08-25 12:35:45 -07:00
Lucas Fairchild-Madar 7d1d7a9724 Preserve delayed initialization semantics 
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
 2017-08-25 12:33:41 -07:00
Lucas Fairchild-Madar b680d1deea Allow for configuring WebSocketClient JVM lifecycle 
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
 2017-08-25 11:23:08 -07:00
Joakim Erdfelt 9f28d26cff Fixed #1766 - Fixing test case results 2017-08-23 15:58:22 -07:00
Joakim Erdfelt 952bb8dfdd Fixing compilation 2017-08-08 10:40:58 -07:00
Joakim Erdfelt 54367621e4 Fixing cdi/websocket pom versions 2017-08-08 09:54:09 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Joakim Erdfelt 796da084b4 Issue #1625 - Support new IANA declared websocket close status codes 2017-08-08 08:49:58 -07:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d.
 2017-07-12 11:28:32 -07:00
Joakim Erdfelt 2d65605de1 Issue #1650 - fixing CDI + websocket integration 2017-07-03 09:19:17 -07:00
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 bc0fd4e1ef No more websocket test errors (need to work on issues) 2017-06-05 14:16:48 -07:00
Joakim Erdfelt f98b4bd087 Fixing javadoc error 2017-06-05 11:16:45 -07:00
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt 3e83908c58 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-06-05 10:02:01 -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
Greg Wilkins d3e50f8f80 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-22 23:37:51 +02: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