Commit Graph

69 Commits

Author SHA1 Message Date
Joakim Erdfelt db1479e571 Merging from revision 787:HEAD on /branches/jetty-7.0.1/ to /trunk/
* Bumping up version to 7.0.1-SNAPSHOT
* Adding jetty-webapp-verifier from /sandbox/
* Changes to jetty-webapp for jetty-centralized-logging from /sandbox/
* Fixes to jetty-policy to support jetty-webapp-verifier



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@835 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-08 20:31:00 +00:00
Jesse McConnell a7f504f899 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@776 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-27 15:18:06 +00:00
Jesse McConnell 0cf3c00feb [maven-release-plugin] prepare release jetty-7.0.0.RC5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@774 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-27 15:17:44 +00:00
Greg Wilkins 28cbed4144 JETTY-838 Dont log and throw
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@766 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-26 09:15:11 +00:00
Jan Bartel 761ba5bedb Ensure if WebInfConfiguration changes the webapp's resource base (eg unpacks WEB-INF) it is set back again during deconfigure() phase.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@759 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 08:28:05 +00:00
Greg Wilkins e417420b70 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@739 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-18 02:41:23 +00:00
Greg Wilkins 974d4c1927 [maven-release-plugin] prepare release jetty-7.0.0.RC4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@737 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-18 02:39:48 +00:00
Greg Wilkins ed1935e101 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@656 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 14:34:05 +00:00
Greg Wilkins 261950e457 no snapshot
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@654 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 14:09:12 +00:00
Greg Wilkins 8913557e88 Improved handling of overlays and resourceCollections
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@652 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 12:30:24 +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
Greg Wilkins dc8985597a updated system and server classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@648 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 01:51:57 +00:00
Greg Wilkins 3a389a2f88 updated system and server classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@647 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 01:29:54 +00:00
Greg Wilkins 2461a40229 handle webapp without WEB-INF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@639 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-05 15:25: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
Greg Wilkins 782fe0f8b5 Improved handling of overlays and resourceCollections
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@616 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-02 23:27:55 +00:00
Greg Wilkins 1465e8ae19 improved ResourceCollection handling
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@614 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-01 00:06:28 +00:00
Greg Wilkins d0f4af9c6b work in progress
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@611 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-31 03:22:37 +00:00
Greg Wilkins ac6f18b3d4 unpack WEB-INF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@610 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-31 03:03:57 +00:00
Greg Wilkins e6b43daf54 unpack WEB-INF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@609 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-31 02:34:25 +00:00
Jesse McConnell 3969b20ffa [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@606 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-29 14:47:24 +00:00
Jesse McConnell 0b4c1c990b [maven-release-plugin] prepare release jetty-7.0.0.RC2
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@604 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-29 14:46:58 +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
Joakim Erdfelt c22ea486a4 Enhancing Warning log entry to output Resource (if defined) that cannot be parsed.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@563 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-17 18:26:46 +00:00
Jesse McConnell 975d2daa77 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@560 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-15 21:22:26 +00:00
Jesse McConnell e0ec404a10 [maven-release-plugin] prepare release jetty-7.0.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@558 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-15 21:18:41 +00:00
Jesse McConnell 57c9074b28 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@523 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 02:39:31 +00:00
Jesse McConnell 0d6314659c [maven-release-plugin] prepare release jetty-7.0.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@521 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 02:39:06 +00:00
Jesse McConnell f9edd70b8b [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@507 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-08 21:29:38 +00:00
Jesse McConnell 9d6f0eb2f5 [maven-release-plugin] prepare release jetty-7.0.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@505 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-08 21:29:19 +00:00
Jesse McConnell 709504d176 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@458 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-01 19:03:11 +00:00
Jesse McConnell a074cb1a9c [maven-release-plugin] prepare release jetty-7.0.0.M4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@456 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-01 19:02:38 +00:00
Jesse McConnell c712013d0a fix version error from release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@427 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-22 16:43:20 +00:00
Jesse McConnell 49aaaa14b3 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@424 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-18 14:15:36 +00:00
Jesse McConnell ff719353f8 [maven-release-plugin] prepare release jetty-7.0.0.M3
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@422 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-18 14:14:58 +00:00
Jesse McConnell 4d1b407c8b revert 7.0.0.M4-SNAPSHOT -> 7.0.0.M3-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@414 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-17 16:06:11 +00:00
Jesse McConnell ce2a2f5a25 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@410 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-16 19:40:10 +00:00
Jesse McConnell 9da1de6601 [maven-release-plugin] prepare release jetty-7.0.0.M3
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@408 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-16 19:39:41 +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 020f12e948 renamed non runtime modules
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@283 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 01:16:27 +00:00
Greg Wilkins 0a28f5adb6 include
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@281 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 23:43:56 +00:00
Greg Wilkins 61d5c7095a fixed fragment processing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@279 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 13:41:25 +00:00
Greg Wilkins bc8b0d7b37 improved scanning of META-INF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@275 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 11:32:19 +00:00
Jan Bartel f10ddda835 Virtual hosts may be non-null but not contain any entries
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@273 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-25 10:50:17 +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 aeabaaab90 Refactor to put looking for jars into a method which can be overridden (eg by the jetty-maven-plugin, which does not have a WEB-INF/lib to look through, but must look through the classloader or the dependencies).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@245 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-21 05:32:43 +00:00
Greg Wilkins 77181eadfe added setConfigurationDiscovered for servlet 3.0 features
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@244 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-20 23:07:08 +00:00
Athena Yao 64eb0863b1 Bug 274251 Dispatch to welcome files which are servlets with no matching static resource
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@240 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-20 06:57:28 +00:00
David Jencks c170801600 Bug 277027 Fix NPE if no security handler installed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@239 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-19 22:33:15 +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