Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,009 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

8009 Commits

Author SHA1 Message Date
Jan Bartel c9dda945f4 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-distribution/src/main/resources/start.ini
 2013-09-12 13:00:41 +10:00
Jan Bartel 0abeb876dc Update start.ini to handle different versions of npn boot jar 2013-09-12 12:37:50 +10:00
Jan Bartel b24928db81 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 11:55:21 +10:00
Greg Wilkins 9b94ab34ba 417022 Request attribute access to Server,HttpChannel & HttpConnection 2013-09-12 10:17:01 +10:00
Greg Wilkins c21ce1183e 417023 Add Default404Servlet if no default servlet set 2013-09-12 10:15:19 +10:00
Jan Bartel be2ecca599 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 10:06:01 +10:00
Joakim Erdfelt 4b3541b7d1 WebSocket / making sure that filter always sees the correct target path, regardless of servlets 2013-09-11 08:56:19 -07:00
Joakim Erdfelt 09f01963ca Minor cleanup of yellow compile warnings 2013-09-11 07:24:25 -07:00
Joakim Erdfelt ddb2629d8c WebSocket / Adding embedded examples for simple servers 2013-09-11 07:24:25 -07:00
Joakim Erdfelt dc59080fca WebSocket / Fixing pathmap matching when query parameters are provided 2013-09-11 07:24:25 -07:00
Simone Bordet c49ba7bdcc Merged branch 'master' into 'jetty-9.1'. 2013-09-11 09:16:39 +02:00
Simone Bordet 9910db17cb Added profile for JDK 1.7.0_40. 2013-09-11 09:15:39 +02:00
Joakim Erdfelt aa9aea00be Adding back missing enable check, correcting javadoc 2013-09-09 19:04:55 -07:00
Joakim Erdfelt d3421070cb Adding back ENABLE attribute for JSR-356 2013-09-09 19:01:23 -07:00
Jan Bartel c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
 2013-09-10 10:18:12 +10:00
Jan Bartel f85acc7437 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
 2013-09-10 09:48:09 +10:00
Jan Bartel ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
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