Jesse McConnell
|
ab94c48735
|
merge from master
|
2012-01-26 10:44:21 -06:00 |
Greg Wilkins
|
6b0a97012c
|
Added RegexTargetHandler
|
2012-01-26 23:14:39 +11:00 |
|
Jesse McConnell
|
90184ab3c3
|
Latest merge from master
|
2012-01-17 13:36:44 -06:00 |
|
Greg Wilkins
|
81c48518b6
|
368635 moved lifecycle state reporting from toString to dump
|
2012-01-16 15:37:32 +11:00 |
|
Greg Wilkins
|
c6693a73ad
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-01-12 23:35:24 +11:00 |
|
Greg Wilkins
|
564cf7329c
|
365302: made map of loggers concurrent and shared in abstract
|
2012-01-12 20:39:24 +11:00 |
Jan Bartel
|
47b7b6db70
|
368113 Support servlet mapping to ""
|
2012-01-12 10:33:25 +11:00 |
|
Jan Bartel
|
691efcc7ca
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-01-11 16:35:57 +11:00 |
|
Jan Bartel
|
2d999a157b
|
368291 Change warning to info for NoSuchFieldException on BeanELResolver.properties
|
2012-01-11 11:02:36 +11:00 |
|
Jan Bartel
|
0dfc9feaf9
|
367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor
|
2011-12-22 19:30:01 +11:00 |
|
Jan Bartel
|
c3643d9937
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-12-21 12:37:23 +11:00 |
|
Jan Bartel
|
2c650a5fdd
|
366316 Superfluous printStackTrace on 404
|
2011-12-12 12:17:16 +11:00 |
|
Jan Bartel
|
0363b8100f
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-12-05 15:24:22 +11:00 |
|
Greg Wilkins
|
050afb8d57
|
365370 ServletHandler can fall through to nested handler
|
2011-12-02 11:09:11 +11:00 |
|
Greg Wilkins
|
de005c68fd
|
Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
|
2011-11-30 16:27:30 +11:00 |
|
Greg Wilkins
|
dcf7ef2335
|
fixes after merge
|
2011-11-29 10:15:20 +11:00 |
|
Greg Wilkins
|
55d5020980
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
|
2011-11-29 09:06:25 +11:00 |
|
Greg Wilkins
|
b969de1788
|
organized imports
|
2011-11-28 15:32:14 +11:00 |
|
Jan Bartel
|
cbec18af60
|
364430 Support web.xml enabled state for servlets
|
2011-11-22 14:09:45 +11:00 |
|
Jan Bartel
|
127a5af8d7
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-11-17 10:59:54 +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
|
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 54e885d967 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 |