Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,572 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

329 Commits

Author SHA1 Message Date
Joakim Erdfelt a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt 65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Greg Wilkins 9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Greg Wilkins c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins e4d51d5c16 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-10 13:25:51 +11:00
Greg Wilkins 1add18a57b 397535 Support pluggable alias checking to support symbolic links 2013-01-10 13:23:11 +11:00
Greg Wilkins 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
Greg Wilkins 8deb1222db Making change to reintroduce this test to merged 8 2013-01-10 13:03:27 +11:00
Greg Wilkins 8232a87411 temporarly remove test 2013-01-10 12:52:21 +11:00
Greg Wilkins 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
Joakim Erdfelt 7a3b440a62 Refactoring Jsp + DefaultServlet + Resource Aliasing test cases 2013-01-09 15:22:32 -07:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 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
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Jan Bartel a4c547d61f Make JspMatchingTest work with jsp 2.1 using maven command line build 2013-01-07 19:18:53 +11:00
Jan Bartel 64df770b42 Make new JspMatchingTest work with jsp2.2 for jetty-8 2013-01-07 12:34:57 +11:00
Jan Bartel d2c2e8693f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-07 10:38:48 +11:00
Joakim Erdfelt c23f722286 Reverting validation changes to FileResource and disabling tests 2013-01-02 10:32:16 -07:00
Joakim Erdfelt 9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -07:00
Joakim Erdfelt 1da584003a Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded 2012-12-27 13:53:38 -07:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00