Jan Bartel
6cbffcb332
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/DirectNIOBuffer.java
2013-06-04 10:39:05 +10:00
Jan Bartel
f65fc71288
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-04 10:37:16 +10:00
Jan Bartel
26c1e5bdbc
407342 ReloadedSessionMissingClassTest uses class compiled with jdk7
2013-06-04 10:34:52 +10:00
Joakim Erdfelt
3464f4c374
Merge branch 'master' into javawebsocket-jsr
2013-06-03 13:04:51 -07:00
Joakim Erdfelt
0c8a3b3f52
Updating Jetty XML use in jetty-deploy tests.
2013-06-03 11:34:38 -07:00
Joakim Erdfelt
670b6a964c
408945 XML Args ignored without DTD
...
+ Semi-reverting prior commit as it broke with DTD use
+ Fixing up logic to allow for <Arg> <Set> <Call> with and without DTD
+ Adding testcase that uses default constructor with <Set> calls to
setup a class
2013-06-03 11:34:38 -07: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
Joakim Erdfelt
020dd1022c
Merge branch 'master' into javawebsocket-jsr
2013-06-03 09:06:38 -07:00
Greg Wilkins
1bbab6d6f2
408945 XML Args ignored without DTD
2013-06-03 18:54:48 +10:00
Greg Wilkins
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Jan Bartel
368523de87
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-03 15:29:07 +10:00
Jan Bartel
10845bfd28
409556 FileInputStream not closed in DirectNIOBuffer
2013-06-03 15:13:28 +10:00
Greg Wilkins
952f8442e5
408529 Etags set in 304 response
...
Improved default servlet setting of etags
2013-06-03 14:22:24 +10:00
Jan Bartel
d581dac287
409684 Ids and properties not set for execution of jetty xml config files with mvn plugin
2013-06-03 12:34:37 +10:00
Jesse McConnell
a2732e3cf6
[Bug 401027] javadoc JMX annotations
2013-05-31 14:37:09 -05:00
Joakim Erdfelt
8fda0504e6
Removing last remnants of Gzip pipelining tests resources
2013-05-31 10:58:33 -07:00
Joakim Erdfelt
e64661ad72
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:57:20 -07:00
Joakim Erdfelt
c708d9ce7c
Removing last remnants of Gzip pipelining tests resources
2013-05-31 10:57:05 -07:00
Joakim Erdfelt
2d964313e8
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:54:16 -07:00
Greg Wilkins
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
Greg Wilkins
8fd796a394
409012 added reference to example rewrite rules
2013-05-31 18:29:44 +10:00
Greg Wilkins
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
Greg Wilkins
842309e656
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
Greg Wilkins
3849c893e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-31 11:07:40 +10:00
Greg Wilkins
3094f93ed9
408642 setContentType from addHeader
2013-05-31 11:06:33 +10:00
Greg Wilkins
219be496d9
408529 Etags set in 304 response
2013-05-31 10:59:34 +10:00
Greg Wilkins
8cb383e065
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 10:12:34 +10:00
Greg Wilkins
8a09c4c787
409545 Change HttpChannel contract
...
Ensure HttpParser always calls sequential callbacks by avoiding |=
2013-05-31 10:03:35 +10:00
Greg Wilkins
b9014f29dc
fixed bad merge
2013-05-31 10:01:13 +10:00
Joakim Erdfelt
998643587d
Merge from [master] to [javawebsocket-jsr]
2013-05-30 16:44:50 -07:00
Joakim Erdfelt
c872b95c04
JSR-356 more work on supporting Streams
2013-05-30 16:25:38 -07:00
Jesse McConnell
8dc84b97e4
remove superfluous roles for example
2013-05-30 09:46:43 -05:00
Greg Wilkins
b59949253d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
Greg Wilkins
3a46498a27
408909 GzipFilter setting of headers when reset and/or not compressed
...
defer commit until aggregate buffer overflows
2013-05-30 17:01:16 +10:00
Greg Wilkins
d8f2350f50
398467 Servlet 3.1 Non Blocking IO
...
Removed double dispatch due to HttpPArser content handler returning true for deferred dispatch.
2013-05-30 16:15:04 +10:00
Jan Bartel
c53efbaff4
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/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-ajp/pom.xml
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
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-http/src/main/java/org/eclipse/jetty/http/gzip/AbstractCompressedStream.java
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-nested/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-rewrite/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-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/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
test-jetty-webapp/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-webapp-rfc2616/pom.xml
2013-05-30 15:36:38 +10:00
Jan Bartel
c869aad145
409436 NPE on context restart using dynamic servlet registration
2013-05-30 15:16:43 +10:00
Greg Wilkins
76457d4807
409441 jetty.xml threadpool arg injection
...
Do not use arg injection for ThreadPool
2013-05-30 11:59:36 +10:00
Jan Bartel
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
Greg Wilkins
94e669afae
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-05-30 10:22:25 +10:00
Greg Wilkins
4996278849
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-30 09:53:10 +10:00
Greg Wilkins
ecbb532897
408909 GzipFilter setting of headers when reset and/or not compressed
...
defer commit until aggregate buffer overflows
2013-05-30 09:49:50 +10:00
Greg Wilkins
c961d65697
398467 Servlet 3.1 Non Blocking IO
...
completed removal of HttpOutput.closeIfAllContentWritten
2013-05-30 09:09:47 +10:00
Jan Bartel
3d553e79a9
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-05-29 11:05:09 +10:00
Jan Bartel
54b62eafcb
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-29 10:54:53 +10:00
Jan Bartel
9f2a641dc0
409133 Empty <welcome-file> causes StackOverflowError
2013-05-29 10:21:53 +10:00
Greg Wilkins
579f8994ca
398467 Servlet 3.1 Non Blocking IO
...
continue after double dispatch with just a logged error
2013-05-29 09:37:43 +10:00
Greg Wilkins
10539d5a3f
fixed NPE in injection
2013-05-29 09:14:27 +10:00
Joakim Erdfelt
4c455e4f9b
JSR-356 - cleaning up Writer support
...
+ Eliminating AppendableByteBuffer in favor of direct CharBuffer use
+ Renaming Utf8ByteBuffer to Utf8CharBuffer to better suit usage
2013-05-28 15:09:48 -07:00
