46e13b305b
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2013-01-17 11:00:20 +11:00
9cf08249e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-17 09:16:40 +11:00
c4e77feefa
unit test uses fake JSP
2013-01-15 15:53:54 +11:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
3efcc2af41
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
e4d51d5c16
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-10 13:25:51 +11:00
1add18a57b
397535 Support pluggable alias checking to support symbolic links
2013-01-10 13:23:11 +11:00
08afd17b88
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 13:04:30 +11:00
8deb1222db
Making change to reintroduce this test to merged 8
2013-01-10 13:03:27 +11:00
8232a87411
temporarly remove test
2013-01-10 12:52:21 +11:00
74edf1867c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 12:06:55 +11:00
7a3b440a62
Refactoring Jsp + DefaultServlet + Resource Aliasing test cases
2013-01-09 15:22:32 -07:00
83aa65415b
Fixing for JDK 6
2013-01-07 09:37:13 -07:00
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
a4c547d61f
Make JspMatchingTest work with jsp 2.1 using maven command line build
2013-01-07 19:18:53 +11:00
39cae560d8
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
tests/test-integration/pom.xml
2013-01-07 16:12:04 +11:00
8d0e776b2a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
test-jetty-webapp/pom.xml
tests/test-integration/pom.xml
2013-01-07 12:47:32 +11:00
64df770b42
Make new JspMatchingTest work with jsp2.2 for jetty-8
2013-01-07 12:34:57 +11:00
d2c2e8693f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-07 10:38:48 +11:00
c23f722286
Reverting validation changes to FileResource and disabling tests
2013-01-02 10:32:16 -07:00
9fde0c56ab
Merge branch 'jetty-7' into jetty-8
2012-12-27 14:22:57 -07:00
1da584003a
Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded
2012-12-27 13:53:38 -07:00
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
3642de3b8a
392237 - Port test-integration to jetty-9
2012-11-19 18:48:03 +11:00
f21b74dcb1
jetty-9 relocated test webapp
2012-11-19 15:57:38 +11:00
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
3683653052
393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management
2012-11-01 20:20:45 +11:00
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02:00
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Simone Bordet