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
4a95621c8b
Creating basic websocket-client examples
2013-05-08 14:18:23 -07:00
c114e925ef
Using subprotocols (its more websockety) in example instead
2013-05-08 12:31:48 -07:00
3fa029ed88
Using query parameters in example instead
2013-05-08 12:26:51 -07:00
281f150831
Adding more websocket servlet examples
2013-05-08 12:22:37 -07:00
63c7556c2a
407469 - Method parameters for @OnWebSocketError should support Throwable
...
+ Simple javadoc fix, code already uses Throwable.
2013-05-08 11:27:51 -07:00
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
08161b5bf7
Cleaning up examples for doc
2013-05-08 11:27:51 -07:00
c41a66bda8
Updating javadoc linking to Java SE 7
2013-05-08 11:27:51 -07:00
ddb84cd55d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-05-08 06:23:15 -05:00
03eba5dce1
Merge branch 'release-9'
2013-05-08 06:23:04 -05:00
7448c4fe57
add https listener config to 900-demo.ini
2013-05-07 10:46:11 +02:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
da82de0acf
set release info
2013-05-06 17:41:16 -05:00
573e90c581
Merge branch 'master' into release-9
2013-05-06 17:38:35 -05:00
ad1e14173c
Squelching the noisy travis per discussion in irc
2013-05-06 15:29:58 -07:00
67f55ec8e5
Merge branch 'jetty-7' into release-7
2013-05-06 17:29:21 -05:00
f2528642d9
Making Jetty WebSocket API Echo Examples more consistent (for doc)
2013-05-06 13:47:28 -07:00
143b387727
Improve styles for test webapps
2013-05-06 19:13:41 +10:00
a5c143063f
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 17:00:47 +10:00
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
b89de0346d
updated jndi, jaas and annotation tests to webapps.demo
2013-05-06 16:16:43 +10:00
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
e7564c9dcd
Merge remote-tracking branch 'origin/jetty-8'
2013-05-06 13:30:53 +10:00
488c1755e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-06 13:22:26 +10:00
9ec10734e5
fixed warn output
2013-05-06 13:04:39 +10:00
1155901cbb
fixed test harness to not have asserts in callbacks
2013-05-06 12:49:50 +10:00
f10a1d709b
407173 java.lang.IllegalStateException: null when using JDBCSessionManager
2013-05-06 12:24:53 +10:00
11dccd7677
reduced test output
2013-05-06 11:43:37 +10:00
98d260dd92
407075 Do not dispatch from complete
...
Call HttpChannel.handle directly from thread calling complete
2013-05-06 11:14:53 +10:00
215f3f1f56
406617 Spin in Request.recycle
...
Improved output in warning
2013-05-06 09:40:49 +10:00
d3f33909c2
improved comments for ini files
2013-05-06 09:26:14 +10:00
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
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
07e9574edf
407214 Reduce build logging of OSGi modules
2013-05-04 11:04:51 +10:00
e433d1c188
maven->mvn
2013-05-03 19:15:03 -05:00
cb75f57838
make test run install
2013-05-03 18:41:22 -05:00
fe1b71f4a0
Reduced build logging for Travis.
2013-05-04 00:26:29 +02:00
fad042015e
Removed OpenJDK build to keep build log small enough for Travis.
2013-05-03 22:56:32 +02:00
c4ad43d0cd
Removed ugly code that does not seem to be any useful.
2013-05-03 19:50:13 +02:00
ebc17e98c3
406861 - IPv6 redirects fail.
2013-05-03 18:56:22 +02:00
c1d655775f
407135 - Unauthorized response causes retry loop.
...
Fixed by adding a conversation flag to check if the authentication has
been tried, and forward the 401 if the flag is found.
2013-05-03 18:28:30 +02:00
5b2aab505f
405570 - spdy push: resource ordering and sequential push.
...
Fixed race condition.
The race was happening when the headers of a push resource
were pushed, then the push resource was completed, which
triggered the send of the next resource, which was polling the
queue but find it empty, because the next resource was not pushed yet.
In this case the activity flag remained true, causing all subsequent
pushes to be skipped.
2013-05-03 17:24:29 +02:00
cb952931d5
connection events in debughandler
2013-05-03 18:54:50 +10:00
f544d6e701
405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class
2013-05-03 18:27:51 +10:00
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
dfbef2db05
Merge remote-tracking branch 'origin/jetty-8'
2013-05-03 16:20:51 +10:00
f4ee8ba48d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-03 16:18:24 +10:00
e2c217d405
407136 @PreDestroy called after Servlet.destroy()
2013-05-03 16:17:16 +10:00
Jan Bartel
Joakim Erdfelt
Jesse McConnell
Thomas Becker
Greg Wilkins
Simone Bordet