200 Commits

Author SHA1 Message Date
Jan Bartel
35c063fb95 Merge fixes from jetty-8: 330188, 330208
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2504 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-15 06:47:58 +00:00
Jesse McConnell
62726cc4e2 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2498 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:20:20 +00:00
Jesse McConnell
e0b27726c2 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2496 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:19:58 +00:00
Jesse McConnell
678e364270 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2494 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:33:07 +00:00
Jesse McConnell
d6b1040f69 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2492 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:32:47 +00:00
Greg Wilkins
e0c0ea3f8b 324679 Fixed dedection of write before static content
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2483 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-08 05:16:54 +00:00
Greg Wilkins
df79fb183b JETTY-1297 Make ServletContext.getContext(String) virtual host aware
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2479 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-08 02:35:58 +00:00
Greg Wilkins
79ca06a386 329643 Improved deployment of resource collections
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2477 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-07 23:38:23 +00:00
Greg Wilkins
543118f837 329410 Enforce XmlConfiguration properties as Map<String,String>
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2469 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-04 02:08:49 +00:00
Jan Bartel
25bfb476ee 328885 - web overrides do not override
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2423 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-28 02:21:37 +00:00
Jan Bartel
e7fd61ed34 328008 - Handle update to Servlet Spec 3 Section 8.2.3.h.ii. Backport from jetty-8 for compatibility.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2405 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-26 05:21:05 +00:00
Jesse McConnell
87f58a2863 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2379 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:47 +00:00
Jesse McConnell
1a9136f4f0 [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2377 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:33 +00:00
Jesse McConnell
5ab4634dfb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2367 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:45 +00:00
Jesse McConnell
83d4febd1e [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2365 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:32 +00:00
Jesse McConnell
3e2de0f439 remove info message pending further review
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2358 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 22:07:06 +00:00
Jesse McConnell
d84b549aca reset version to remove RC# from version string to maintain support with osgi versioning
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2356 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 19:16:49 +00:00
Jesse McConnell
0fcbbbf1e9 reset version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2355 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 18:47:42 +00:00
Jesse McConnell
9b07b75df7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2354 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:58 +00:00
Jesse McConnell
933c065d1b [maven-release-plugin] prepare release jetty-7.2.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2352 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:45 +00:00
Greg Wilkins
1261de5cdc 327725 multiple web.xml overrides
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2347 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-14 23:16:53 +00:00
Jesse McConnell
fdff282605 JETTY-1288 added info for when atypical classloader set on WebAppContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2330 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-07 18:21:17 +00:00
Jesse McConnell
d389d12771 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2311 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:30 +00:00
Jesse McConnell
89bd58d11b [maven-release-plugin] prepare release jetty-7.2.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2309 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:18 +00:00
Jan Bartel
731aa82359 JETTY-1063, JETTY-1136, JETTY-1166, JETTY-1254, 305791
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2296 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-22 10:44:37 +00:00
Greg Wilkins
7fb5d15d13 325468 Clean work webapp dir before unpack
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2284 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-16 22:31:16 +00:00
David Jencks
5d49fe9d29 bugs 324811 and 324812. Fix an NPE and restore a constructor used by geronimo
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2263 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-09 00:40:22 +00:00
David Jencks
1e5ceb27dc bug 324360 validate input on getResource since loop logic obscures subclass input validation. Port from jetty 8 rev 324360
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2240 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-03 00:55:28 +00:00
Jesse McConnell
a3033e34f8 JETTY-1261 resolve usage of null listener is StandardDescriptorProcessor
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2218 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-18 17:43:59 +00:00
Greg Wilkins
16caeeb478 320073 template deployments
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2203 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-03 00:41:57 +00:00
Jan Bartel
00cbe30682 320073 - fix previous refactoring: ensure ORDERED_LIBS only set if an ordering is present
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2193 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-29 01:59:19 +00:00
Greg Wilkins
cbc47fca80 320073 local loader
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2191 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-28 13:48:54 +00:00
Jan Bartel
bd272143e2 320073 ensure Decorators get called in reverse order of addition; refactor TagLibConfiguration and Descriptor classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2187 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 23:59:16 +00:00
Greg Wilkins
b4f4c0ae36 320073 further improved configuration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2175 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 09:40:47 +00:00
Jan Bartel
badbe6d252 Ooops. Ensure MetaData.origins is set
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2174 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 08:56:32 +00:00
Jan Bartel
30996d5446 320073
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2173 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 08:00:55 +00:00
Greg Wilkins
3ca0c6806a 320073
support decorator cloning for WebAppContext templates

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2171 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 06:33:54 +00:00
Greg Wilkins
0443786d8e 320073 reconsile configuration mechanism
Reconsiled the jetty-8 configuration mechanism with the capability to share the MetaData between instances

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2168 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 03:20:41 +00:00
Jan Bartel
c5583b9ac2 Update to jetty-8-to-jetty-7-base-20100721-1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2162 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-21 03:15:29 +00:00
Greg Wilkins
6478b5ede7 improved debug dump
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2155 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-20 00:46:34 +00:00
Jan Bartel
32a89ffaf7 Backport from 7 to 8 of changes to reconciliation of webapp config mechanism. See bugzilla 320073
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2152 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-19 06:15:57 +00:00
Jan Bartel
314f94decc 320073 Reconcile jetty-8 and jetty-7 webapp configuration mechanisms
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2145 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-16 07:15:13 +00:00
Greg Wilkins
16be43597f 319370 WebAppClassLoaderContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2088 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-09 11:42:19 +00:00
Greg Wilkins
b02766dd53 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2078 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:10:04 +00:00
Greg Wilkins
82923e5197 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2076 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:09:39 +00:00
Greg Wilkins
a4d25de6c4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2073 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:43:19 +00:00
Greg Wilkins
f2726d74d1 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2071 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:42:53 +00:00
Hugues Malphettes
1fd3ff55c5 bug 318152
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2055 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 09:58:53 +00:00
Hugues Malphettes
e107b03350 bug 318152
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2054 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 09:57:04 +00:00
Greg Wilkins
517130e909 317759 Allow roles and constraints to be added after init
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2043 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-24 00:39:13 +00:00