Commit Graph

8094 Commits

Author SHA1 Message Date
Joakim Erdfelt 31ff31c8b1 Undo temporary change for memory testing reasons 2013-09-09 12:23:50 -07:00
Joakim Erdfelt aeac72a684 416812 - Don't start WebSocketClient for every context
+ Lazy initializing WebSocketClient connection manager
  to avoid holding threads that the selector manager
  will allocate.
2013-09-09 12:06:57 -07:00
Joakim Erdfelt b1b8e2b0a1 Adding Example for javax.websocket Client use 2013-09-09 10:08:58 -07:00
Joakim Erdfelt 7e3ef36f16 Revert "416812 Only start WebSocketContainer if enabled by attribute"
This reverts commit a1cba900c5.
2013-09-09 09:28:33 -07:00
Greg Wilkins f7bde55038 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-09-09 18:28:35 +10:00
Thomas Becker 598fa8acf7 415401 WebAppProvider: override XmlConfiguration.initializeDefaults 2013-09-09 10:05:37 +02:00
Greg Wilkins 8c0f6328a1 415401 Add initalizeDefaults call to SpringConfigurationProcessor
remove deprecated XmlBeansFactory usage
2013-09-09 18:01:03 +10:00
Thomas Becker 5d21e4246b 415401 WebAppProvider: override XmlConfiguration.initializeDefaults 2013-09-09 09:49:08 +02:00
Greg Wilkins 6ff664baf2 416015 Handle null Accept-Language and other headers 2013-09-09 17:47:25 +10:00
Greg Wilkins 843e94e4e0 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
2013-09-09 17:11:38 +10:00
Greg Wilkins e2e1b47edf 416015 Handle null Accept-Language and other headers 2013-09-09 16:51:37 +10:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Jan Bartel 7df5cf762c Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-09 12:44:20 +10:00
Jan Bartel cdd95bb551 Merge remote-tracking branch 'origin/jetty-8' 2013-09-09 12:42:56 +10:00
Jan Bartel 11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10:00
Jan Bartel 67bdc29b9b 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:30:52 +10:00
Greg Wilkins a1cba900c5 416812 Only start WebSocketContainer if enabled by attribute 2013-09-09 12:27:15 +10:00
Simone Bordet 400f0ce5a2 Made remove() methods return the removed value. 2013-09-08 23:02:24 +02:00
Joakim Erdfelt 092fb2d36a Adding jetty-websocket-all aggregate in prep for android compatible jar 2013-09-06 16:36:16 -07:00
Simone Bordet 3cdf4dece1 Refactored some behaviour to base classes to ease the FCGI
implementation, and taken the chance to remove redundant code.
2013-09-07 00:36:31 +02:00
Simone Bordet e09415145f Removed unchecked warning. 2013-09-06 23:38:46 +02:00
Joakim Erdfelt ed0f49f819 416763 - WebSocket / Jsr Session.getPathParameters() is empty
+ Adding support for `extends Endpoint` based endpoints as well
2013-09-06 14:35:22 -07:00
Joakim Erdfelt fe4a778334 416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
+ Relying on WebSocketSession.getRequestURI() instead.
2013-09-06 13:57:05 -07:00
Joakim Erdfelt eeb8a51c88 416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
+ Adding test cases to verify behavior.
2013-09-06 13:47:49 -07:00
Joakim Erdfelt 50d98ab527 416763 - WebSocket / Jsr Session.getPathParameters() is empty
+ Ensuring this works as intended with new test case
2013-09-06 13:40:49 -07:00
Joakim Erdfelt 714bbf943a Removing @ServerEndpoint caching, its just getting in the way 2013-09-06 12:28:33 -07:00
Thomas Becker 9008210c2e setuid.mod, ext.mod fix module errors 2013-09-06 17:34:28 +02:00
Joakim Erdfelt db19102bba Fixing distribution - adding servlets.mod + javax.mail support 2013-09-06 07:53:35 -07:00
Thomas Becker e26ce1b303 /jetty-webapp/src/main/config/etc/webdefault.xml fix xml error 2013-09-06 16:34:02 +02:00
Thomas Becker 30487639a7 Merge commit '1f765bf9ae124eb10562b9de85d3dc5dfdc916f1' into jetty-9.1 2013-09-06 13:27:00 +02:00
Thomas Becker 1f765bf9ae Merge branch 'XmlConfiguration' 2013-09-06 12:24:05 +02:00
Thomas Becker 77889089a9 415401 Add initalizeDefaults call to SpringConfigurationProcessor 2013-09-06 12:23:42 +02:00
Jan Bartel 3d7c1324d9 416681 Remove unnecessary security constraints in test-jetty-webapp 2013-09-06 16:58:53 +10:00
Greg Wilkins ef98f89e5c 416680 remove uncovered constraint warning 2013-09-06 16:56:15 +10:00
Greg Wilkins ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Jan Bartel c6355854ab Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-06 15:33:45 +10:00
Jan Bartel 27b977f57d 416679 Change warning to debug if no transaction manager present 2013-09-06 15:32:38 +10:00
Greg Wilkins 5c3f498624 create directories on module ini 2013-09-06 13:06:15 +10:00
Greg Wilkins 9e90e1267f fixed bad merge 2013-09-06 09:47:36 +10:00
Greg Wilkins c3bd5752ee Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-06 09:19:45 +10:00
Greg Wilkins ee52769dea 416663 Content-length set by resourcehandler 2013-09-06 09:19:05 +10:00
Greg Wilkins fefab2af96 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-09-06 07:04:44 +10:00
Thomas Becker 178c38cc35 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 18:40:59 +02:00
Thomas Becker 28f3c1ac01 Merge commit '9e0e173de813c3dd825becb9c3f67739f25e936b' into jetty-8 2013-09-05 17:34:39 +02:00
Thomas Becker 9e0e173de8 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 17:30:59 +02:00
Jan Bartel 810fbdc439 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 18:31:53 +10:00
Jan Bartel b8a4bf37e6 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations 2013-09-05 18:24:12 +10:00
Jan Bartel 6fb95b8ad7 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 13:20:39 +10:00
Greg Wilkins a3f6633385 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-09-05 13:19:12 +10:00