Commit Graph

10616 Commits

Author SHA1 Message Date
Simone Bordet c22088bfd0 Fixed CSS to remove space between rows. 2015-03-20 13:31:39 +01:00
Jan Bartel 576892d739 461415 Maven Jetty Plugin ignores ZIP overlays 2015-03-20 16:42:30 +11:00
Jan Bartel f6b4be9abe 457508 Add flag to scan exploded jars in jetty-jspc-maven-plugin 2015-03-20 15:51:22 +11:00
Jan Bartel 7c53dfe5a4 459734 Update to apache jsp 8.0.20 2015-03-19 17:19:05 +11:00
Greg Wilkins ad4854dafe Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-03-19 15:13:15 +11:00
Greg Wilkins 7acbb05060 fixed test that failed on second boundary 2015-03-19 15:12:43 +11:00
Greg Wilkins caacebc223 459845 - Support upgrade from http1 to http2
functioning implementation.  Not exactly the most elegant solution, but works with nghttp2 -u
2015-03-19 12:02:54 +11:00
Joakim Erdfelt e21d24b035 454934 - WebSocketClient / connectToServer can block indefinitely during upgrade failure
+ Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-18 16:23:39 -07:00
Joakim Erdfelt 57b6debb87 454934 - WebSocketClient / connectToServer can block indefinitely during upgrade failure
+ Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-18 16:20:50 -07:00
John Myers a9be633816 [Bug 462098] Support setting ThreadGroup in ScheduledExecutorScheduler
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:14:53 -04:00
John Myers c8b84e0291 [Bug 462098] Support setting ThreadGroup in QueuedThreadPool
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:10:56 -04:00
Greg Wilkins c082848f93 462193 - Asynchronous HttpOutput.close()
Dispatch to handle on return from onWritePossible()
2015-03-18 10:28:14 +11:00
Joakim Erdfelt bb3243182e Cleaning up CDI WebSocketScope behavior 2015-03-17 10:22:23 -07:00
Joakim Erdfelt 1e3fe991e3 Increasing logging level for when websocket fails to open due to exception 2015-03-17 10:22:05 -07:00
Joakim Erdfelt 6e952d4618 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00
Simone Bordet 81f29576e6 Prevented NPE in abort(). 2015-03-16 08:17:25 +01:00
Simone Bordet 4f0c63734c 462162 - StackOverflowException when response commit fails.
Fixed HttpChannel to avoid to stack overflow in case of unusual
exceptions thrown while committing.
Now it directly calls the transport to try to send a 500.
2015-03-15 12:10:27 +01:00
Joakim Erdfelt 4a41317501 459273 - Redundant license notices
+ Adding missing .hasFiles() check in download path.
2015-03-13 13:35:04 -07:00
Greg Wilkins 93a6811580 462040 reverted and deprecated getStringField methods 2015-03-13 14:51:08 +11:00
Greg Wilkins 3f795da26c 459845 - Support upgrade from http1 to http2
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
Simone Bordet 0bcf1fade3 Removed forgotten System.err.println() debug statements. 2015-03-13 00:37:39 +01:00
Simone Bordet ffb15aa5fb Made test more reliable.
Testing for stream.isClosed() is done in StreamCloseTest.
The tests were failing because receiving the headers does not mean
the sending the headers has notified the callback yet, and hence
closed the stream.
2015-03-12 20:54:40 +01:00
Simone Bordet feed8ea158 Small refactoring of HTTP/2 upgrade code. 2015-03-12 19:08:26 +01:00
Joakim Erdfelt 79fb2a4083 Fixing build 2015-03-12 10:42:09 -07:00
Joakim Erdfelt b75f8dcda4 Cleaning up cdi-websocket in prep for merge 2015-03-12 10:09:53 -07:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Joakim Erdfelt 0301de099d Delaying decoration of websocket endpoints 2015-03-12 10:09:52 -07:00
Joakim Erdfelt dc81cda742 Using Jetty component listeners for CDI 2015-03-12 10:09:52 -07:00
Joakim Erdfelt 31ee46d482 453834 - CDI Support for WebSocket
+ Breaking down jetty-cdi into 3 modules
  * cdi-core
  * cdi-servlet
  * cdi-websocket
+ Creating WebSocketScope for cdi-websocket
+ Creating @Produces for jetty websocket api session
  and javax.websocket.Session
+ Unit tests for new functionality
2015-03-12 10:09:52 -07:00
Joakim Erdfelt 3008ab85e5 This developer is a dummy 2015-03-12 10:09:52 -07:00
Joakim Erdfelt 87246263b8 453834 - CDI Support for WebSocket
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
  till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
  of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
  ContainerDefaultEndpointConfigurator, all others are trusted
  to be complete and injected already.
2015-03-12 10:09:52 -07:00
Joakim Erdfelt e213c4488e 453834 - CDI Support for WebSocket
+ Updating javadoc
2015-03-12 10:09:30 -07:00
Joakim Erdfelt 8b6a2629f8 453834 - CDI Support for WebSocket 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 3711f329a1 Breaking ant <property> caching for cdi tests 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 5b5c2369d5 Stragglers to the new year. tsk. tsk. 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 4435ba3c2b cleaning up build warnings 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 1f3097ff16 453834 - CDI Support for WebSocket
+ Adding scopes to websocket to help with CDI integration
2015-03-12 10:09:30 -07:00
Joakim Erdfelt 0c930c8640 Rename EnhancedInstantiator to DecoratedObjectFactory 2015-03-12 10:06:03 -07:00
Joakim Erdfelt c65e6aaab7 Attempting to validate socket + cdi 2015-03-12 10:04:50 -07:00
Joakim Erdfelt d6911b431f 453834 - CDI Support for WebSocket
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
Joakim Erdfelt 5c3e30d136 453834 - CDI Support for WebSocket
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
  usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
Joakim Erdfelt fb88bc4c19 Making ServletContextHandler use util.Decorators
+ Deprecating methods that are just awkward now.
   ServletContextHandler.getDecorators() - as it expects the
     ServletContextHandler.Decorator version
2015-03-12 10:04:13 -07:00
Joakim Erdfelt 2b7b5ef495 Rethinking Decorators 2015-03-12 10:04:13 -07:00
Greg Wilkins b7d719be5f 459845 - Support upgrade from http1 to http2
Parse setting frame.
2015-03-13 00:54:33 +11:00
Simone Bordet e9658c0aef Clarified ALPN properties. 2015-03-12 14:01:31 +01:00
Simone Bordet 64de5c861c Removed forgotten System.err.println() debug statements. 2015-03-12 12:42:26 +01:00
Simone Bordet 005870811d Fixed compilation issue: using Jetty's B64Code instead of JDK8 Base64. 2015-03-12 11:06:30 +01:00
Jan Bartel afa926d45d 461919 - Use osgi-friendly serviceloader mechanism for WebSocketServletFactory 2015-03-12 18:51:05 +11:00
Greg Wilkins 0dd58d2efe 459845 - Support upgrade from http1 to http2
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
Greg Wilkins e3d380bb7d 461941 JMX Remote host:port set from start properties 2015-03-12 13:41:18 +11:00