Commit Graph

140 Commits

Author SHA1 Message Date
Simone Bordet 5297d98350 Fixes #356693 (Too much of the websocket implementation is exposed to the webapp).
WebSocketServlet must be loaded from the webapp classloader, even if the webapp is configured to have parent classloader priority.
2011-09-05 13:45:33 +02:00
Greg Wilkins 898dcc8b2a 356693 reduce visibility to webapp of websocket implementations 2011-09-05 11:24:37 +10:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Jesse McConnell af07e1cef8 [Bug 355854] remove automatic conversion in favor of issuing a warning for jetty-web.xml that can't be processed 2011-08-26 11:12:25 -05:00
Jesse McConnell 05fe9dc2d4 [Bug 355854] provide simple mechanism to convert jetty6 jetty-web.xml files to jetty7 on the fly 2011-08-26 11:12:24 -05:00
Jesse McConnell 06881d2717 [Bug 355854] provide simple mechanism to convert jetty6 jetty-web.xml files to jetty7 on the fly 2011-08-26 11:12:24 -05:00
Joakim Erdfelt 3399242d83 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -07:00
Jesse McConnell 062feb4750 [Bug 353165] remove a directory check for directories of jar files,
rational being that some users wish to point to unpacked jar files
using symbolic links and this was preventing that behavior
2011-07-29 11:21:13 -05:00
Jan Bartel fb8fb0e2f8 353095 - maven-jetty-plugin: PermGen leak due to javax.el.BeanELResolver
Also found that java beans can be leaked via java.beans.Introspector so fixed that too.
2011-07-29 11:05:45 +10:00
Jesse McConnell ba30be6408 [Bug 349005] add javadoc detailing the convenience hack of removing
leading /'s
2011-07-21 08:51:44 -05:00
Jesse McConnell 3919023be5 [Bug 352133] resolve some 1.5isms 2011-07-18 12:54:19 -05:00
Greg Wilkins aa278294c3 348652 jetty.sh starts two unix processes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3414 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 07:27:29 +00:00
Greg Wilkins 31ac6dd388 348935 Close A tag in directory listing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3412 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:49:12 +00:00
Jan Bartel f3a6c8f8ef 334443 - Improve the ability to specify extra class paths using the Jetty Maven Plugin
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3271 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:18:10 +00:00
Jan Bartel 07c619d457 336220 - tmp directory is not set if you reload a webapp with jetty-maven-plugin
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3270 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:13:56 +00:00
Hugues Malphettes d6639b77b5 bug 346027 tolerate META-INF/web-fragment.xml that are inside a directory instead of a jar.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3199 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 03:50:46 +00:00
Jesse McConnell 5f01e2428b Bug 345729 add binding that can allow for global management of server and system classes for webapp contexts, added 2 gettings on webappcontext for getting default server and system class settings.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3143 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 20:22:12 +00:00
Greg Wilkins 11de671982 332907 code cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3121 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 07:20:21 +00:00
Michael Gorovoy a28d3bc37a 332907 Add context property to ObjectName of JMX MBeans
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3120 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 04:54:39 +00:00
Greg Wilkins 1aeb9fb761 343680 Handle OSGi bundle jars not ending in ".war"
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3108 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 06:50:36 +00:00
Greg Wilkins 540ba7174f 332907 backed out the change until reviewed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3103 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 02:29:06 +00:00
Michael Gorovoy 6e197c7ba2 332907 Add context property to ObjectName of JMX MBeans
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3101 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 18:06:31 +00:00
Greg Wilkins 4cd8b077b5 343482 refactored overlay deployer layout to use WAR layout
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3076 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-05 03:03:12 +00:00
Michael Gorovoy 69ee5b641d 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3056 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-02 23:21:12 +00:00
Jan Bartel 3b6dd2778b JETTY-954 WebApp context can now throw optionally throw an error out of doStart(), and the Server doStart() is modified to not catch and log all errors.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3033 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 07:35:59 +00:00
Jesse McConnell fe12431d2e Bug 343277 add support for an optional context white list
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3022 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-19 15:27:43 +00:00
Michael Gorovoy f1a3caeaca 341145 WebAppContext MBean attribute serverClasses returns empty value
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2918 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-28 18:03:01 +00:00
Jesse McConnell 6e62a61af3 341006 move inner enums out into separate files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2913 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 21:04:39 +00:00
Jan Bartel 5ae7e22bef Make counter on FragmentDescriptor static so generated fragment names are unique.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2870 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-08 00:42:08 +00:00
Greg Wilkins a934da2d09 338920 Handle non existent real path directories
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2857 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 02:48:55 +00:00
Joakim Erdfelt f3a2a575aa Fixing broken javadoc and imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-21 20:49:28 +00:00
Jan Bartel d30089db18 333608 - tlds defined in web.xml are not picked up
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2633 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-07 14:15:22 +00:00
Greg Wilkins 881e599860 333679 Refactored jetty-jmx. Moved mbeans to modules.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 18:04:58 +00:00
Greg Wilkins 68323125b6 improved debugging dumps
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2625 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-04 17:44:11 +00:00
Greg Wilkins f49e76f356 allow configuration during starting state
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2616 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 11:40:45 +00:00
Greg Wilkins e10c14c77a 332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI
Also added Dumpable interface to improve and standardize the output of nested structures while debugging

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2615 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 11:27:02 +00:00
Greg Wilkins 246cde364b improved test timing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2611 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-16 10:55:25 +00:00
Greg Wilkins 796f444914 332703 Cleanup context scope JNDI at stop
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2610 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-16 10:35:07 +00:00
Greg Wilkins 312cf416ec minor cleanups and test improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2603 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-09 16:49:46 +00:00
Jan Bartel b063893cdf 330419 - reloading webapp duplicates StandardDescriptorProcessor
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2529 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-17 03:30:14 +00:00
Jan Bartel a9a56e8716 330229 - Jetty tries to parse META-INF/*.tld when jsp-api is not on classpath, causing DTD entity resoluton to fail
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2525 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-17 01:43:11 +00:00
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
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 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
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