Commit Graph

69 Commits

Author SHA1 Message Date
Jan Bartel 8f62be9fef 442628 Update example xml file for second server instance to extract wars 2014-08-27 17:22:37 +10:00
Greg Wilkins 18b6a9b3d9 435533 Handle 0 sized async gzip 2014-08-14 07:48:27 +10:00
Jan Bartel 9167a09279 Update embedded example for annotations and jndi to point to demo-base wars 2014-08-01 16:22:03 +10:00
Jan Bartel 424de52d96 411163 Add embedded jetty code example with JSP enabled 2014-08-01 16:16:26 +10:00
Greg Wilkins 2d52280179 436987 limited range of default acceptors and selectors 2014-07-17 14:29:58 +10:00
Simone Bordet b994db698c Refactored NPN code for the soon-to-arrive ALPN code.
Moved NPN tests to new module spdy-npn-tests, that now is the only module
requiring the -Xbootclasspath configuration for the Maven Surefire Plugin.
2014-03-20 16:22:43 +01:00
Greg Wilkins a85b855921 Revert ALPN and java 8 changes to move to another branch
Reverts e9ecd8c,2f22a10,addc49f,f4e4b09,cf1c245
Disabled unit test from commit 47e7583
2014-03-19 12:54:04 +11:00
Simone Bordet cf1c2451d6 Implemented ALPNServerConnection and refactored common code with NPN. 2014-03-18 23:59:18 +01:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins 6848186bfa 422734 messages per second in ConnectorStatistics 2013-11-28 18:40:46 +11:00
Greg Wilkins 74272663e6 420359 - Support 0 acceptors for ServerConnector 2013-11-04 16:16:54 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins b52d7f09b0 418068 WebSocketClient has lazy or injected Executor 2013-09-26 18:06:55 +10: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
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
Joakim Erdfelt 7f85842666 417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
+ Extensions pre-negotiated via
  ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
  properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00
Greg Wilkins c21ce1183e 417023 Add Default404Servlet if no default servlet set 2013-09-12 10:15:19 +10: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
Greg Wilkins b5d3aeab0f Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-08-30 14:41:33 +10:00
Greg Wilkins 47c679dabb 416102 - Clean up of async sendContent process 2013-08-30 14:37:43 +10:00
Jan Bartel 280000e88a Merge remote-tracking branch 'origin/master' into jetty-9.1
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
	examples/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/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-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/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/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	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-http-server/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-29 12:59:32 +10:00
Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10:00
Thomas Becker 86e8cf7b29 embedded SPDYServer test - save one line of code by setting maxThreads in constructor 2013-07-24 13:14:37 +02:00
Thomas Becker 1a6698d43b embedded SPDYServer test - save one line of code by setting maxThreads in constructor 2013-07-24 13:12:28 +02:00
Greg Wilkins b8f7637e7d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-22 23:32:04 +10:00
Greg Wilkins 8f190476b7 413393 better logging of bad URLs in Resources 2013-07-22 23:30:43 +10:00
Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Jan Bartel b86344e269 Added new examples of embedding JNDI,annotations and updated realm.properties to match distro 2013-06-07 08:49:28 +10:00
Jesse McConnell 8b39cbe5bf update proxy example 2013-06-03 12:44:19 -05:00
Jesse McConnell fc87693ba9 add proxy server example from proxy tests into the embedded examples 2013-06-03 12:21:27 -05:00
Greg Wilkins 8cb383e065 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-31 10:12:34 +10:00
Jesse McConnell 8dc84b97e4 remove superfluous roles for example 2013-05-30 09:46:43 -05:00
Greg Wilkins 5397f16559 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
Greg Wilkins 76d4859eda 398467 Servlet 3.1 Non Blocking IO
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10:00
Jan Bartel 2360f5dcd5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Greg Wilkins 23e049d42c turn off logging in embedded 2013-04-22 14:23:14 +10:00
Jan Bartel 87d4690462 405533 Implement special role ** for security constraints 2013-04-19 15:53:45 +10:00
Greg Wilkins c912231d74 364921 - FIN WAIT sockets 2013-04-15 18:40:05 +10:00
Greg Wilkins 4b546de9c9 364921 - FIN WAIT sockets 2013-04-15 17:19:35 +10:00
Greg Wilkins 2e5dd6b442 405679 example other server for documentation 2013-04-15 11:59:48 +10:00
Greg Wilkins 108a8e9dca 404326 set status when Request.setHandled(true) is called 2013-03-26 23:36:31 +11:00
Greg Wilkins e8d76ef12c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
	jetty-server/src/main/config/etc/jetty-requestlog.xml
	jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
	jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
	jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00