8134 Commits

Author SHA1 Message Date
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
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
Thomas Becker
317f4b7de1 416453 Add comments to embedded FileServer example 2013-09-19 11:33:05 +02:00
Thomas Becker
1394559e00 416453 Add comments to embedded SpdyServer example 2013-09-19 11:33:01 +02:00
Thomas Becker
5499a5f726 416453 Add comments to embedded SplitFileServer example 2013-09-19 11:31:48 +02:00
Thomas Becker
a7692b5af0 416453 Add comments to embedded SecuredHelloHandler example 2013-09-19 11:15:56 +02:00
Thomas Becker
4daaa6f855 416453 Add comments to embedded OneWebApp example 2013-09-19 11:04:42 +02:00
Greg Wilkins
be6f876621 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-09-19 17:08:40 +10:00
Greg Wilkins
52aba6f1aa updated VERSIONS.txt with 7 relase 2013-09-19 17:01:46 +10:00
Jan Bartel
d4c035a06f 417561 Refactor annotation related code to remove some deadwood 2013-09-19 15:43:38 +10:00
Greg Wilkins
3acda280a8 416577 enhanced shutdown handler to send shutdown at startup 2013-09-19 12:28:07 +10:00
Greg Wilkins
ba5a709245 416577 enhanced shutdown handler to send shutdown at startup 2013-09-19 09:19:55 +10:00
Greg Wilkins
c6a29339ab 417475 Do not null context Trie during dynamic deploy 2013-09-19 09:00:57 +10:00
Thomas Becker
016fbbb07f 416453 Add comments to embedded MinimalServlets example 2013-09-18 17:55:24 +02:00
Thomas Becker
6377503caa 416453 Add comments to embedded ManyConnectors example 2013-09-18 17:55:24 +02:00
Thomas Becker
36efbb9869 416453 Add comments to embedded FileServer example 2013-09-18 17:55:23 +02:00
Thomas Becker
b4a8871b62 416453 Add comments to embedded SpdyServer example 2013-09-18 17:55:23 +02:00
Joakim Erdfelt
aa5705fd78 417490 - WebSocket / @PathParam annotated parameters are null when the servlet mapping uses a wildcard
+ Fixing ServletUpgradeRequest.getRequestPath() to conform to behavior
 found in WebSocketUpgradeFilter.doFilter()
2013-09-18 06:35:12 -07:00
Joakim Erdfelt
a00b3d1e68 Merge branch 'release-9.1' into jetty-9.1 2013-09-17 10:08:27 -07:00
Joakim Erdfelt
c5775a6ccf Using correct version for master 2013-09-17 09:41:45 -07:00
Jesse McConnell
2d35fa9558 Merge branch 'release-8' into jetty-8 2013-09-17 11:39:30 -05:00
Thomas Becker
74a75e3d42 test chat fix 2013-09-17 14:39:00 +02:00
Thomas Becker
2e064351a1 test chat fix 2013-09-17 14:36:58 +02:00
Thomas Becker
9fb8fbec14 416940 avoid download of spring-beans.dtd 2013-09-17 12:41:05 +02:00