8156 Commits

Author SHA1 Message Date
Greg Wilkins
b636c58af6 fixed test.xml overlay 2013-09-30 13:56:37 +10:00
Jan Bartel
92233ebf83 417561 Refactor annotation related code: change log messages 2013-09-30 13:27:05 +10:00
Jan Bartel
afb1b69171 Add some more timing instrumentation to annotation related processing 2013-09-30 13:27:05 +10:00
Jan Bartel
df336f3476 417561 Refactor annotation related code - remove unneeded log statements 2013-09-30 13:27:05 +10:00
Jan Bartel
0400289826 417561 Refactor annotation related code - make annotation phase able to be multithreaded 2013-09-30 13:27:05 +10:00
Greg Wilkins
0fd656dcbe Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-30 13:20:54 +10:00
Greg Wilkins
5f02620603 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Greg Wilkins
a59439241f 418227 Null cookie value test 2013-09-30 12:59:34 +10:00
Greg Wilkins
f07722909f reduced routine exception verbosity 2013-09-30 12:45:16 +10:00
Jan Bartel
cb554948a2 417574 Setting options with _JAVA_OPTIONS breaks run-forked with <waitForChild>true</waitForChild> 2013-09-30 12:23:14 +10:00
Joakim Erdfelt
a03221abd0 Merge branch 'master' into jetty-9.1 2013-09-27 11:40:54 -07:00
Joakim Erdfelt
8d312b9e5d 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
+ Adding timeout on test
2013-09-27 11:40:35 -07:00
Joakim Erdfelt
273f61210e 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
+ Adding timeout on test
2013-09-27 11:39:52 -07:00
Greg Wilkins
7dec90fafb some demo cleanups 2013-09-27 17:47:31 +10:00
Greg Wilkins
0fac295cd8 418014 Handle NTFS canonical exceptions during alias check
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
Greg Wilkins
080781ec0e Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-27 13:37:55 +10:00
Greg Wilkins
458e511ce2 418014 Handle NTFS canonical exceptions during alias check 2013-09-27 13:37:00 +10:00
Joakim Erdfelt
1ccba6e172 Clean up class + param order consistency 2013-09-26 10:30:29 -07:00
Joakim Erdfelt
b966545a95 417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
+ removing etc/jetty-websockets.xml (now irrelevant)
2013-09-26 10:13:12 -07:00
Joakim Erdfelt
1fcede8b8b Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
2013-09-26 06:07:06 -07:00
Joakim Erdfelt
e92f0965c7 Removing scope test 2013-09-26 06:06:23 -07:00
Greg Wilkins
b52d7f09b0 418068 WebSocketClient has lazy or injected Executor 2013-09-26 18:06:55 +10:00
Greg Wilkins
643b6c3c77 removed ExecutorCallback 2013-09-26 18:06:10 +10:00
Joakim Erdfelt
948d97c60c Fixing various javadoc errors 2013-09-25 10:08:39 -07:00
Joakim Erdfelt
ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Joakim Erdfelt
a50054c74b Fixing typo in usage.txt 2013-09-24 11:53:23 -07:00
Joakim Erdfelt
edf0e4f707 Removing websocket.mod ini-template, as using the mod is the same as the ini-template 2013-09-24 09:02:04 -07:00
Joakim Erdfelt
937a91a0db 417938 - Startup / Sort properties presented in --list-config alphabetically 2013-09-24 09:00:30 -07:00
Joakim Erdfelt
a20b39e9ab Fixing build error 2013-09-23 14:11:04 -07:00
Joakim Erdfelt
cd236bc016 417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
+ Removed WebSocketConfiguration class entirely + annotation handlers
+ Renamed ServerAppliationConfigListener to
  WebSocketServerContainerInitializer
+ Embedded jetty code that used to use:
  WebSocketContainer.configureContext(context) now uses
  WebSocketServerContainerInitializer.configureContext(context)
2013-09-23 13:30:14 -07:00
Joakim Erdfelt
cc9c19fd9d Merge branch 'master' into jetty-9.1 2013-09-23 11:18:04 -07:00
Joakim Erdfelt
0e34cdf7d8 417831 - Remove jetty-logging.properties from distro/resources 2013-09-23 11:17:32 -07:00
Thomas Becker
2ef4a4fb1c fix SimpleHTTPBenchmarkTest 2013-09-23 15:07:47 +02:00
Thomas Becker
bfb90523d6 SPDY remove unnecessary flush calls 2013-09-23 14:39:49 +02:00
Greg Wilkins
4708c907c1 417284 Precompiled regex in HttpField 2013-09-23 15:19:41 +10:00
Greg Wilkins
857d534d8d 417239 re-implemented Request.getContentRead() 2013-09-23 15:10:46 +10:00
Greg Wilkins
f2f8ec54c6 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
Greg Wilkins
d96df5d1c7 improved low resources messages 2013-09-23 13:30:09 +10:00
Jan Bartel
911f271817 417561 Refactor annotation related code
Log a warning if not able to check valid classname when scanning a directory (wars that are not unpacked are still able to be scanned even though Resource.getFile().getName() will return null).
2013-09-20 18:08:19 +10:00
Jan Bartel
07f3230784 412469 make module for jetty-jaspi 2013-09-20 17:56:02 +10:00
Jan Bartel
c784812e08 Fix title of JSP module in comment header 2013-09-20 15:52:50 +10:00
Jan Bartel
cf9f007fbd 417340 Upgrade JDT compiler to one that supports source/target of Java 1.7 2013-09-20 15:36:55 +10:00
Greg Wilkins
cb33fa36fd Use modules to initialise demo-base where possible 2013-09-20 14:24:22 +10:00
Thomas Becker
5346e06d4a 417289 SPDY replace use of direct buffers with indirect buffers or make it configurable 2013-09-19 15:43:07 +02:00
Jan Bartel
73d0ed8d71 417561 Refactor annotation related code
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10:00
Thomas Becker
ad5624f000 416453 Add comments to embedded SplitFileServer example 2013-09-19 11:36:32 +02:00
Thomas Becker
c9c54ef4d1 416453 Add comments to embedded SecuredHelloHandler example 2013-09-19 11:35:33 +02:00
Thomas Becker
50926a0436 416453 Add comments to embedded OneWebApp example 2013-09-19 11:33:36 +02:00
Thomas Becker
f19f6ce5cd 416453 Add comments to embedded MinimalServlets example 2013-09-19 11:33:21 +02:00
Thomas Becker
cea01925f7 416453 Add comments to embedded ManyConnectors example 2013-09-19 11:33:12 +02:00