198 Commits

Author SHA1 Message Date
Greg Wilkins
0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins
6edb7c1930 organised imports 2011-10-18 15:05:22 +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
Jesse McConnell
9b9bc9e79c Add an additional test using forwarding via filter 2011-09-29 15:14:26 -05:00
Jesse McConnell
7ecea5afd0 [Bug 359309] resolve include and forward issues related to resource handler 2011-09-28 18:30:20 -05:00
Jesse McConnell
45e6cfa790 [Bug 359309] fix unit test to use HttpServlet*Wrappers and reformat the resourcehandler a bit to debug last two issues 2011-09-28 18:02:27 -05:00
Jesse McConnell
e7af27ad34 [Bug 359309] add unit tests showing the problem, 1/4 pass right now, the 3 failing are marked @Ignore for now. 2011-09-28 16:16:09 -05:00
Jesse McConnell
2ef624e9fa add resource dir for tests 2011-09-20 10:11:26 -05:00
Greg Wilkins
0949443fab 358164 Dispatch from servlet to handler 2011-09-20 12:59:22 +10:00
Jesse McConnell
7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jan Bartel
a96052def2 356751 Add null protection to ServletContextHandler.doStop 2011-09-06 09:25:55 +10:00
Jan Bartel
1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt
4ace183764 Merging from master 2011-08-25 12:09:36 -07:00
Michael Gorovoy
a81611400d 354080 ServletContextHandler allows to replace any subordinate handler when restarted 2011-08-24 18:14:10 -04:00
Joakim Erdfelt
f7f7e0af75 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-security, jetty-server, jetty-servlet,
  jetty-servlets, jetty-websocket
2011-08-24 12:53:27 -07:00
Greg Wilkins
ee1afa5e97 353073 cleaned up no context logging 2011-08-16 17:59:28 +10: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
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
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
b890ff8fb2 applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser. 2011-07-07 12:16:58 +10:00
Greg Wilkins
b2f5416fcd made HttpClient dumpable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3236 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 01:21:52 +00:00
Joakim Erdfelt
26d59fda32 Javadoc error cleanup.
+ Removing missing class references
+ Fixing empty @return statements
+ Delinking invalid direction class references
+ Correcting @param <name> typos

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3219 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 22:26:41 +00:00
Jesse McConnell
fd46348570 revert innocuous change that crept in my last commit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3165 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:56:54 +00:00
Jesse McConnell
898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +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
9c9f151ff4 332907 link structure before adding beans to container
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3119 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 01:52:06 +00:00
Hugues Malphettes
dedc2b648d bug 336056 Ability to override the computation of the ContextHandler to deploy the DefaultServlet on equinox's HttpServiceServlet.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3104 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 03:29:29 +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
6f8c330015 JETTY-1326 Invoker names not hashCode based
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3098 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 07:33:49 +00:00
Greg Wilkins
62cdc0d1b4 JETTY-1347 updated javadoc for filters
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3095 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 03:57:00 +00:00
Greg Wilkins
aa398ad41c 343083 Set nested dispatch type
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3020 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-18 05:37:50 +00:00
Greg Wilkins
c226f9c5a8 JETTY-1362 Set root cause of UnavailableException
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3002 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-12 04:18:59 +00:00
Greg Wilkins
e5bad59c14 minor clean ups and removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-11 08:18:01 +00:00
Simone Bordet
5febe18d52 Modified attempt to delete files on Windows without failing the test, take #2.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2936 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 14:05:41 +00:00
Simone Bordet
da0160029d Modified attempt to delete files on Windows without failing the test.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2935 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 13:51:50 +00:00
Greg Wilkins
3ec94365ae 324110 Added test harnesses for merging of QueryStrings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2897 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-16 22:23:31 +00:00
Joakim Erdfelt
acc4f230fc Merging back /branches/jetty-bug-296978 revs 2674:HEAD
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 18:58:47 +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
Greg Wilkins
ef6899c2c7 332517 Improved DefaultServlet debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2637 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 13:20:30 +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
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
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
fca35e43a2 fixed endswithslash test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2558 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-25 02:45:17 +00:00
Greg Wilkins
6c01234e7c Several minor fixes:
Limit size of indirect buffer for direct serving of content.
default servlet redirects directories without trailing / better

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2557 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-25 02:45:00 +00:00
Greg Wilkins
cf583b1cfe more robust handling of pathInfo only
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2546 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-20 22:46:39 +00:00
Greg Wilkins
835751c2ef improved test harness timing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2538 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-19 00:25:32 +00:00
Greg Wilkins
834e0ef1d8 324679 Fixed dedection of write before static content
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2484 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-08 06:35:19 +00:00