Commit Graph

236 Commits

Author SHA1 Message Date
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel 0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +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
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel 73a8065132 357209 JSP tag listeners not called 2011-09-12 14:47:09 +10:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt f6d45d5650 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
Jan Bartel 6081e74fe6 353285 - ServletSecurity annotation ignored 2011-07-29 12:03:35 +10:00
Jan Bartel f1b743a114 Enable annotations by default (because they are needed by servlet 3.0) 2011-07-11 18:00:34 +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
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
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 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
Jan Bartel b4edc055a1 332796 - Annotations inheritance does not work with jetty7
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2612 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-17 11:50:16 +00:00
Jan Bartel bd272143e2 320073 ensure Decorators get called in reverse order of addition; refactor TagLibConfiguration and Descriptor classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2187 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 23:59:16 +00:00
Greg Wilkins b4f4c0ae36 320073 further improved configuration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2175 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 09:40:47 +00:00
Greg Wilkins 3ca0c6806a 320073
support decorator cloning for WebAppContext templates

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2171 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 06:33:54 +00:00
Jan Bartel c5583b9ac2 Update to jetty-8-to-jetty-7-base-20100721-1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2162 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-21 03:15:29 +00:00
Jan Bartel 32a89ffaf7 Backport from 7 to 8 of changes to reconciliation of webapp config mechanism. See bugzilla 320073
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2152 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-19 06:15:57 +00:00
Jan Bartel 314f94decc 320073 Reconcile jetty-8 and jetty-7 webapp configuration mechanisms
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2145 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-16 07:15:13 +00:00
Jan Bartel 64e78003fb 316254 Implement @DeclareRoles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1953 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 08:22:37 +00:00
Simone Bordet 5b4de08242 Fix for #308850 (Update test suite to JUnit4 - Module jetty-annotations).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1749 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-11 14:46:12 +00:00
Joakim Erdfelt 6bc437c298 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1626 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:04 +00:00
Jan Bartel 681c29bcdb Ensure we don't look in WEB-INF/lib for webapps that don't have a WEB-INF.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1424 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 18:07:06 +00:00
Greg Wilkins 227fb5abec numerous code cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1014 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-26 07:48:39 +00:00
Jan Bartel d627905f4b JETTY-780
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@859 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-10 11:51:11 +00:00
Jan Bartel ecc9b9b417 Remove context attributes in postConfigure() phase of configuration that are not needed during deconfigure().
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@649 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 03:41:56 +00:00
Jan Bartel 8e9e7d5179 Unset context attributes during Configuration.deconfigure() that were set during Configuration.configure().
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@628 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-04 07:52:03 +00:00
Jan Bartel 0358f29479 Bring jetty-7 into line with new annotation parsing mechansim from jetty-8
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@575 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-22 00:51:14 +00:00
Jan Bartel 4675e38841 Ensure MetaInfConfiguration finds all candidate jars from the container path and also from web-inf, then applies inclusion patterns to them to do an initial ordering. Jetty-8 will modify this ordering based on web-fragment ordering. The list of jars is passed around as a context attribute. The inclusion patterns are specified as context attributes. The ContextDeployer and WebAppDeployer can be configured with context attributes (such as the default inclusion patterns) that are set on every context they deploy. The list of jars are passed around as a List of Resources, and the pattern matching is done based on the URI (ie as a name string) rather than as a jar URL.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@310 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-28 03:51:44 +00:00
Greg Wilkins 515c800bf9 imports and formatting
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@269 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 01:45:02 +00:00
Jan Bartel fc50b231f6 Rename Configuration class to make purpose clearer.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@258 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-22 08:36:51 +00:00
Jan Bartel 9391163a29 Remove draft servlet spec 3 pojo annotation types; refactor annotation processing to make processing of non-classpath files easier (eg for jetty-maven-plugin); take out some debug printlns accidentally left in.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@257 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-22 08:31:06 +00:00
Jan Bartel 688fbac7aa New Configuration structure. This structure will be modified in jetty-8 to accommodate servlet spec3. This checkin moves jetty-7 closer to that final structure. Configuration now consists of 3 phases: preConfigure(), configure() and postConfigure(). All Configurations can now be chained together rather than having to override/replace existing Configurations.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@230 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-19 07:40:36 +00:00
Greg Wilkins 0f510e6753 This commit takes jetty-7 back to the 2.5 servlet API, but leaves much of the
3.0 asynchronous machinery available.

Introduces a new improved Continuation API that is an evolution of the 
original Continuation API, while taking some good ideas from the 3.0 spec.
The intention is that this API will simplify the use of the 3.0
API, while making it available in jetty-7 (scalably) and in all other
2.5 containers with the ContinuationFilter.





git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@27 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-29 02:15:22 +00:00
Greg Wilkins da627b843f jetty @ eclipse initial commit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-24 21:07:27 +00:00