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 |
|
Jan Bartel
|
e7e7e45500
|
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
|
2013-08-15 19:13:13 +10:00 |
|
Jan Bartel
|
716430bb03
|
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
|
2013-08-15 18:03:49 +10:00 |
|
Jan Bartel
|
3d13c15d35
|
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
|
2013-08-15 17:22:03 +10:00 |
|
Jan Bartel
|
7947b35134
|
Reset version for rerun of 9.0.5
|
2013-08-15 16:47:03 +10:00 |
|
Jesse McConnell
|
4383c9042d
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-13 14:20:56 -05:00 |
|
Jesse McConnell
|
160d34ec23
|
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
|
2013-08-13 14:20:47 -05:00 |
|
Jan Bartel
|
2c3ecf9e38
|
414731 Request.getCookies() should return null if there are no cookies
|
2013-08-09 18:08:16 +10:00 |
|
Joakim Erdfelt
|
8636c7da45
|
Merge branch 'master' into jetty-9.1
Conflicts:
jetty-maven-plugin/pom.xml
pom.xml
|
2013-08-05 09:53:48 -07:00 |
|
Joakim Erdfelt
|
e2d872fcc7
|
Merge branch 'jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
pom.xml
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
|
2013-08-05 08:47:24 -07:00 |
|
Joakim Erdfelt
|
01786aa0c2
|
Merge branch 'jetty-7' into jetty-8
|
2013-08-02 15:11:05 -07:00 |
|
Joakim Erdfelt
|
79ac8ad22d
|
Fixing License Header to conform with standard with rest of project
|
2013-08-02 14:34:03 -07:00 |
|
Joakim Erdfelt
|
2057c4c17b
|
Upgrading Junit + Hamcrest
|
2013-08-02 14:25:53 -07:00 |
|
Jan Bartel
|
47a8809ec7
|
413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener
|
2013-08-02 12:26:54 +10:00 |
|
Jesse McConnell
|
20bd1e0f96
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-26 11:50:17 -05:00 |
|
Jesse McConnell
|
49c3b2c32a
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
|
2013-07-26 11:49:58 -05:00 |
|
Jesse McConnell
|
6ed360c480
|
reset for release
|
2013-07-26 11:23:57 -05:00 |
|
Jesse McConnell
|
1a5117e9ab
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
|
2013-07-26 11:18:24 -05:00 |
|
Jesse McConnell
|
650e8e93ae
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-26 10:57:33 -05:00 |
|
Jesse McConnell
|
e7e2fce56e
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
|
2013-07-26 10:57:26 -05:00 |
Simone Bordet
|
9d571af7b0
|
Merged branch 'master' into 'jetty-9.1'.
|
2013-07-26 13:55:05 +02:00 |
|
Simone Bordet
|
5c7eb9e265
|
Reverted version to 7.6.12-SNAPSHOT.
|
2013-07-26 13:36:35 +02:00 |
|
Jan Bartel
|
e6974dadab
|
Harmonize with jetty-9 apis
|
2013-07-26 18:01:37 +10:00 |
|
Jesse McConnell
|
49045558ef
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 14:07:12 -05:00 |
|
Jesse McConnell
|
9b888d5c22
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
|
2013-07-25 14:06:53 -05:00 |
|
Jesse McConnell
|
de2840ca1e
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 12:52:15 -05:00 |
|
Jesse McConnell
|
3e94867f7f
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
|
2013-07-25 12:52:07 -05:00 |
|
Jesse McConnell
|
bc679809f8
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 11:25:58 -05:00 |
|
Jesse McConnell
|
39ec9b8051
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
|
2013-07-25 11:25:51 -05:00 |
|
Jan Bartel
|
1d77a139fd
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-07-25 23:06:33 +10:00 |
|
Jesse McConnell
|
e0ad2c4ee1
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 07:52:39 -05:00 |
|
Jesse McConnell
|
99712058ca
|
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
|
2013-07-25 07:52:32 -05:00 |
|
Jesse McConnell
|
767dbe6778
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 07:48:09 -05:00 |
|
Jesse McConnell
|
cfa6076c4f
|
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
|
2013-07-25 07:48:02 -05:00 |
|
Jan Bartel
|
50a67eac6a
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
|
2013-07-25 13:22:14 +10:00 |
|
Jan Bartel
|
72b077921d
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-07-25 11:26:35 +10:00 |
|
Joakim Erdfelt
|
ab7268e516
|
413684 - Trailing slash shows JSP source
+ Adding testcase to replicate issue.
|
2013-07-24 16:43:02 -07:00 |
|
Simone Bordet
|
3b7322f53b
|
Merged branch 'master' into 'jetty-9.1'.
|
2013-07-23 10:01:17 +02:00 |
|
Jan Bartel
|
f19421112a
|
405535 implement Request.isUserInRole(role) check security-role-refs defaulting to security-role if no matching ref
|
2013-07-23 17:20:55 +10:00 |
|
Greg Wilkins
|
b8f7637e7d
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-07-22 23:32:04 +10:00 |
|
Greg Wilkins
|
e4ef8ee1f4
|
413154 ContextHandlerCollection defers virtual host handling to ContextHandler
|
2013-07-22 22:10:13 +10:00 |
|
Joakim Erdfelt
|
2e1ad360ae
|
Fixing compilation failure
|
2013-07-16 18:17:14 -07:00 |
|
Jan Bartel
|
bd2add0ae9
|
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
|
2013-07-12 13:53:58 +10:00 |
|
Greg Wilkins
|
965918d8f2
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-07-04 17:28:57 +10:00 |
|
Greg Wilkins
|
c33db24d94
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
|
2013-07-04 15:00:47 +10:00 |
|
Joakim Erdfelt
|
78b5f7df1f
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-25 08:29:26 -07:00 |
|
Joakim Erdfelt
|
5f2c937fcb
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
|
2013-06-25 08:29:18 -07:00 |
|
Jesse McConnell
|
298b46a96f
|
set for re-reelease
|
2013-06-21 15:35:58 -05:00 |
|
Jesse McConnell
|
8927c18840
|
reset versions for release
|
2013-06-21 15:28:26 -05:00 |
|
Jesse McConnell
|
57bfda2a08
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-21 09:49:25 -05:00 |
|
Jesse McConnell
|
c1082ad4d4
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
|
2013-06-21 09:49:15 -05:00 |
|
Jan Bartel
|
4f6732a7e9
|
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
|
2013-06-21 18:41:35 +10:00 |
|
Joakim Erdfelt
|
f8c457f75e
|
Merge branch 'jetty-9.1' into javawebsocket-jsr
|
2013-06-19 15:07:15 -07:00 |
|
Joakim Erdfelt
|
2da8c9c306
|
Merge branch 'master' into javawebsocket-jsr
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
|
2013-06-17 10:54:10 -07:00 |
|
Greg Wilkins
|
4e4ffaa54c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-06-17 16:29:39 +10:00 |
|
Jan Bartel
|
2ea7843d86
|
Merge remote-tracking branch 'origin/jetty-8'
|
2013-06-17 14:39:17 +10:00 |
|
Jan Bartel
|
1908fff38f
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-06-17 14:11:46 +10:00 |
|
Jan Bartel
|
59889bc149
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2013-06-17 13:17:14 +10:00 |
|
Jan Bartel
|
232eb4491a
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
|
2013-06-17 13:13:59 +10:00 |
|
Thomas Becker
|
391b0ee426
|
ChatServletTest fix test
|
2013-06-13 17:36:29 +02:00 |
|
Jesse McConnell
|
a582b42d45
|
add logging properties for testing
|
2013-06-13 10:31:23 -05:00 |
|
Thomas Becker
|
df17ef8b3a
|
408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message.
|
2013-06-13 16:58:57 +02:00 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Greg Wilkins
|
f8e0764fa5
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-06-11 14:07:46 +10:00 |