Greg Wilkins
|
f567bddad9
|
global clean up imports
|
2013-11-04 13:48:03 +11:00 |
|
Greg Wilkins
|
eb3bb660b5
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
|
2013-11-03 18:22:09 +11:00 |
Mikhail Mazursky
|
6b0269a16d
|
[Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
|
2013-11-02 14:44:36 +06:00 |
|
Greg Wilkins
|
852be79a3c
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
|
2013-11-01 14:45:16 +11:00 |
|
Greg Wilkins
|
56fcfa45fb
|
420844 Connection:close on exceptional errors
|
2013-11-01 13:37:44 +11:00 |
|
Greg Wilkins
|
defa3a04cf
|
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-osgi/test-jetty-osgi/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-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-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
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-base/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-10-14 13:10:02 +11:00 |
|
Greg Wilkins
|
ad124b6888
|
419309 Added symlink checker to test webapp
|
2013-10-14 11:59:18 +11:00 |
Joakim Erdfelt
|
562cf009f0
|
Fixing javadoc
|
2013-10-03 09:13:37 -07:00 |
|
Greg Wilkins
|
2d53fe8744
|
cleaned up demo
|
2013-10-03 18:43:06 +10:00 |
Jesse McConnell
|
856a24b65a
|
[maven-release-plugin] prepare for next development iteration
|
2013-09-30 14:46:09 -05:00 |
|
Jesse McConnell
|
f466f03c6a
|
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
|
2013-09-30 14:46:00 -05:00 |
|
Jesse McConnell
|
0b3f431d27
|
set version back to 9.0.6-SNAPSHOT
|
2013-09-30 12:33:06 -05:00 |
|
Greg Wilkins
|
b636c58af6
|
fixed test.xml overlay
|
2013-09-30 13:56:37 +10:00 |
|
Greg Wilkins
|
7dec90fafb
|
some demo cleanups
|
2013-09-27 17:47:31 +10:00 |
|
Greg Wilkins
|
cb33fa36fd
|
Use modules to initialise demo-base where possible
|
2013-09-20 14:24:22 +10:00 |
|
Jesse McConnell
|
0525498ad3
|
[maven-release-plugin] prepare for next development iteration
|
2013-09-19 15:06:31 -05:00 |
|
Jesse McConnell
|
c05a725db6
|
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
|
2013-09-19 15:06:17 -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 |
|
Greg Wilkins
|
a2a475b4af
|
minor text cleanups in demo webapps
|
2013-09-13 15:51:55 +10:00 |
Jan Bartel
|
4b274b7933
|
417111 Demo / login with admin/admin fails
|
2013-09-13 12:31:51 +10:00 |
|
Jan Bartel
|
cdec1e9d85
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-09-13 12:15:03 +10:00 |
|
Jan Bartel
|
0b80b9ba36
|
417110 Demo / html body end tag missing in authfail.html
|
2013-09-13 12:13:47 +10:00 |
|
Greg Wilkins
|
43c92f8117
|
416812 - Don't start WebSocketClient for every context
turn off for all contexts in demo
|
2013-09-12 20:44:13 +10:00 |
|
Joakim Erdfelt
|
7e3ef36f16
|
Revert "416812 Only start WebSocketContainer if enabled by attribute"
This reverts commit a1cba900c5.
|
2013-09-09 09:28:33 -07:00 |
|
Greg Wilkins
|
a1cba900c5
|
416812 Only start WebSocketContainer if enabled by attribute
|
2013-09-09 12:27:15 +10:00 |
|
Jan Bartel
|
3d7c1324d9
|
416681 Remove unnecessary security constraints in test-jetty-webapp
|
2013-09-06 16:58:53 +10:00 |
|
Greg Wilkins
|
ef98f89e5c
|
416680 remove uncovered constraint warning
|
2013-09-06 16:56:15 +10:00 |
|
Greg Wilkins
|
ace43502ad
|
refined start.jar mechanism to align with updated documentation
|
2013-09-06 16:10:03 +10:00 |
|
Joakim Erdfelt
|
d539fd7e5f
|
Adding jsp module to demo
|
2013-08-30 13:09:14 -07:00 |
|
Joakim Erdfelt
|
7d50302562
|
Fixing distribution build + demo-base start port
|
2013-08-29 15:26:31 -07:00 |
|
Joakim Erdfelt
|
a5addbeb5a
|
jetty-distribution / making demo-base function?
|
2013-08-29 15:26:31 -07:00 |
|
Joakim Erdfelt
|
8a1f12ae81
|
jetty-start / fixing build + work towards demo-base
|
2013-08-29 11:49:33 -07:00 |
|
Jan Bartel
|
c183c6fad5
|
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
|
2013-08-29 12:59:50 +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
|
c84063a5f8
|
415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
|
2013-08-28 23:53:32 +10:00 |
|
Greg Wilkins
|
c1bd267c17
|
415826 start.jar replace --enable with --initialize
|
2013-08-28 15:41:27 +10:00 |
|
Greg Wilkins
|
d66778ad06
|
415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
|
2013-08-28 09:30:03 +10:00 |
|
Joakim Erdfelt
|
866a9c96d2
|
jetty-start / removing --module= references in start.ini
+ making sure that demo.mod starts jetty appropriately.
+ making sure that --disable-module=demo works as advertised with
jetty-distribution
|
2013-08-26 16:47:08 -07:00 |
|
Joakim Erdfelt
|
14ec13000d
|
Moving demo related files in distro to ${jetty.base}/demo/ directory
|
2013-08-26 09:50:31 -07:00 |
|
Jesse McConnell
|
ef166c23e6
|
Merge branch 'release-9'
|
2013-08-23 18:58:01 -05:00 |
|
Joakim Erdfelt
|
2e94149ea3
|
Merge branch 'jetty-9.1' into jetty-9.1-altstart
|
2013-08-23 11:49:41 -07:00 |
|
Greg Wilkins
|
e4235ea070
|
415744 - Reduce Future usage in websocket
|
2013-08-23 19:58:46 +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 |
|
Joakim Erdfelt
|
a396563340
|
414635 Modular start.d and jetty.base property
+ More work on startup of real jetty server.
|
2013-08-22 14:52:02 -07:00 |
|
Jesse McConnell
|
307fdced91
|
Merge branch 'master' into jetty-9.1
|
2013-08-20 14:02:45 -05:00 |
|
Jesse McConnell
|
a69deacc4c
|
[Bug 411069] update minimum jdk versions in pom.xml's
|
2013-08-20 12:40:33 -05:00 |
|
Joakim Erdfelt
|
4016ba571c
|
JSR-356 working javax.websocket demo in the distribution.
|
2013-08-15 12:20:06 -07:00 |
|
Joakim Erdfelt
|
662d00855d
|
Adding javax.websocket chat to test-jetty-webapp
|
2013-08-15 12:20:06 -07:00 |
|
Jan Bartel
|
c80100b4a9
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-15 19:13:27 +10:00 |