Jan Bartel
a8f24a2b64
360066 jsps referenced in web.xml <jsp-file> elements do not compile
2011-10-06 17:32:31 +11:00
Jan Bartel
32dbb1bddb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/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-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
Jan Bartel
8d6f64c902
358687 Updated jsp does not scan for system tlds
2011-09-23 14:51:25 +10:00
Jan Bartel
73a8065132
357209 JSP tag listeners not called
2011-09-12 14:47:09 +10:00
Jesse McConnell
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
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
Jan Bartel
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +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
Jan Bartel
02a66a00fb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
2011-08-01 14:39:39 +10: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
Jan Bartel
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +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
Jan Bartel
86f7e76c4d
Merge of jetty-7 into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-webapp-rfc2616/pom.xml
2011-07-11 12:05:58 +10:00
Greg Wilkins
17e907c2fb
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10: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
