Jesse McConnell
|
0731cbe64d
|
Merge branch 'master' into jetty-8
|
2012-02-22 14:42:39 -06:00 |
|
Thomas Becker
|
8de385992e
|
372256: fix if clause doing an || instead of && and thus always calling instanceOf on null values
|
2012-02-22 14:42:11 -06:00 |
|
Jesse McConnell
|
098428dd37
|
Merge branch 'master' into jetty-8
|
2012-02-15 13:49:23 -06:00 |
|
Joakim Erdfelt
|
9207423ca0
|
Fixing JDK5 build abort due to bad javadocs
|
2012-02-06 10:01:44 -07:00 |
|
Jesse McConnell
|
c918bb4e3c
|
Merge branch 'master' into jetty-8
|
2012-01-25 10:31:44 -06:00 |
|
Greg Wilkins
|
ae5ddb2930
|
369216 turned off the shared resource cache
|
2012-01-23 14:31:25 +11:00 |
|
Jan Bartel
|
6e3c8094f1
|
368112 NPE on <jsp-config><taglib> element parsing web.xml
|
2012-01-09 11:07:41 +11:00 |
|
Jan Bartel
|
0dfc9feaf9
|
367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor
|
2011-12-22 19:30:01 +11:00 |
|
Greg Wilkins
|
de005c68fd
|
Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
|
2011-11-30 16:27:30 +11:00 |
|
Jan Bartel
|
cbec18af60
|
364430 Support web.xml enabled state for servlets
|
2011-11-22 14:09:45 +11:00 |
|
Jan Bartel
|
837f8d33c4
|
364283 can't parse the servlet multipart-config for the web.xml
|
2011-11-22 12:17:07 +11:00 |
|
Jan Bartel
|
127a5af8d7
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-11-17 10:59:54 +11:00 |
|
Greg Wilkins
|
61664d3c0f
|
Added concept of SslConnection
|
2011-10-26 01:15:59 +11:00 |
|
Jan Bartel
|
fc497fe1e8
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-10-24 16:30:10 +11:00 |
|
Greg Wilkins
|
a642f7b55c
|
Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
|
2011-10-24 11:27:42 +11:00 |
|
Greg Wilkins
|
cd0628ab66
|
Added isDebugEnabled guards to debugging that generates garbage
|
2011-10-22 09:39:54 +11:00 |
|
Greg Wilkins
|
6edb7c1930
|
organised imports
|
2011-10-18 15:05:22 +11:00 |
|
Jan Bartel
|
d862348b4c
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
|
2011-10-06 18:31:57 +11:00 |
|
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 |
|