Joakim Erdfelt
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
Simone Bordet
355c682faa
407326 - Test Failure: org.eclipse.jetty.client.HttpClientStreamTest.testInputStreamResponseListenerFailedBeforeResponse[0].
...
Instead of using port 0, now using an ephemeral port that is not listening anymore.
2013-05-09 12:34:07 +02:00
Simone Bordet
858d58708d
407246 - Test harness checked results in callbacks ignored.
...
Reverted commit 1155901cbb6f49439636242017504f0eadd35bb0.
2013-05-09 12:14:03 +02:00
Jan Bartel
bd153af2e2
Update to temporarily use jsp 2.3 and el 3.0 from maven
2013-05-09 17:17:46 +10:00
Greg Wilkins
fce27416e3
406923 Accept CRLF or LF but not CR as line termination
...
Improved BadMessage handling
2013-05-09 15:18:47 +10:00
Greg Wilkins
331359ab05
include
2013-05-09 15:15:15 +10:00
Greg Wilkins
09476ac235
406923 Accept CRLF or LF but not CR as line termination
...
Better handling of FF character
2013-05-09 15:01:50 +10:00
Greg Wilkins
50021c7ce4
407491 Better handle empty Accept-Language
2013-05-09 15:00:27 +10:00
Greg Wilkins
4dcc9b39fc
407614 added excludedMimeTypes to gzipFilter
2013-05-09 14:16:54 +10:00
Jan Bartel
9b57f9e29a
Fix test-spec test for new annotation added.
2013-05-09 12:18:53 +10:00
Jan Bartel
2fb23e705c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
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/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-plus/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-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-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-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-05-09 11:29:45 +10:00
Joakim Erdfelt
4a95621c8b
Creating basic websocket-client examples
2013-05-08 14:18:23 -07:00
Joakim Erdfelt
c114e925ef
Using subprotocols (its more websockety) in example instead
2013-05-08 12:31:48 -07:00
Joakim Erdfelt
3fa029ed88
Using query parameters in example instead
2013-05-08 12:26:51 -07:00
Joakim Erdfelt
281f150831
Adding more websocket servlet examples
2013-05-08 12:22:37 -07:00
Joakim Erdfelt
63c7556c2a
407469 - Method parameters for @OnWebSocketError should support Throwable
...
+ Simple javadoc fix, code already uses Throwable.
2013-05-08 11:27:51 -07:00
Joakim Erdfelt
f92aab9b88
407470 - Javadoc for @OnWebSocketFrame incorrectly references WebSocketFrame object
...
+ Simple javadoc change, code already uses Frame, not WebSocketFrame.
2013-05-08 11:27:51 -07:00
Joakim Erdfelt
08161b5bf7
Cleaning up examples for doc
2013-05-08 11:27:51 -07:00
Joakim Erdfelt
c41a66bda8
Updating javadoc linking to Java SE 7
2013-05-08 11:27:51 -07:00
Jesse McConnell
ddb84cd55d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-05-08 06:23:15 -05:00
Jesse McConnell
03eba5dce1
Merge branch 'release-9'
2013-05-08 06:23:04 -05:00
Thomas Becker
7448c4fe57
add https listener config to 900-demo.ini
2013-05-07 10:46:11 +02:00
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Jesse McConnell
da82de0acf
set release info
2013-05-06 17:41:16 -05:00
Jesse McConnell
573e90c581
Merge branch 'master' into release-9
2013-05-06 17:38:35 -05:00
Joakim Erdfelt
ad1e14173c
Squelching the noisy travis per discussion in irc
2013-05-06 15:29:58 -07:00
Jesse McConnell
67f55ec8e5
Merge branch 'jetty-7' into release-7
2013-05-06 17:29:21 -05:00
Joakim Erdfelt
f2528642d9
Making Jetty WebSocket API Echo Examples more consistent (for doc)
2013-05-06 13:47:28 -07:00
Jan Bartel
143b387727
Improve styles for test webapps
2013-05-06 19:13:41 +10:00
Jan Bartel
a5c143063f
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 17:00:47 +10:00
Jan Bartel
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
Greg Wilkins
b89de0346d
updated jndi, jaas and annotation tests to webapps.demo
2013-05-06 16:16:43 +10:00
Jan Bartel
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
Jan Bartel
e7564c9dcd
Merge remote-tracking branch 'origin/jetty-8'
2013-05-06 13:30:53 +10:00
Jan Bartel
488c1755e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-06 13:22:26 +10:00
Greg Wilkins
9ec10734e5
fixed warn output
2013-05-06 13:04:39 +10:00
Greg Wilkins
1155901cbb
fixed test harness to not have asserts in callbacks
2013-05-06 12:49:50 +10:00
Jan Bartel
f10a1d709b
407173 java.lang.IllegalStateException: null when using JDBCSessionManager
2013-05-06 12:24:53 +10:00
Greg Wilkins
11dccd7677
reduced test output
2013-05-06 11:43:37 +10:00
Greg Wilkins
98d260dd92
407075 Do not dispatch from complete
...
Call HttpChannel.handle directly from thread calling complete
2013-05-06 11:14:53 +10:00
Greg Wilkins
215f3f1f56
406617 Spin in Request.recycle
...
Improved output in warning
2013-05-06 09:40:49 +10:00
Greg Wilkins
d3f33909c2
improved comments for ini files
2013-05-06 09:26:14 +10:00
Simone Bordet
6a47e4456f
406015 - Query parameters and POST queries.
...
Fixed proxy case where the path is rewritten to be absolute.
2013-05-05 20:33:44 +02:00
Simone Bordet
7d5ac2918e
406015 - Query parameters and POST queries.
...
Reworked the way query parameters are handled, making it more
consistent between request.path(...) and request.param(...).
Removed the hardcoding of passing parameters as body in POSTs.
2013-05-05 18:47:43 +02:00
Jan Bartel
07e9574edf
407214 Reduce build logging of OSGi modules
2013-05-04 11:04:51 +10:00
Jesse McConnell
e433d1c188
maven->mvn
2013-05-03 19:15:03 -05:00
Jesse McConnell
cb75f57838
make test run install
2013-05-03 18:41:22 -05:00
Simone Bordet
fe1b71f4a0
Reduced build logging for Travis.
2013-05-04 00:26:29 +02:00
Simone Bordet
fad042015e
Removed OpenJDK build to keep build log small enough for Travis.
2013-05-03 22:56:32 +02:00
