262 Commits

Author SHA1 Message Date
Greg Wilkins
595f0e6f72 JETTY-1231 support context request log
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1933 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 10:15:05 +00:00
Greg Wilkins
a2bd4024c7 315925 Improved context xml configuration handling
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1932 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 05:50:31 +00:00
Michael Gorovoy
f68610a2b9 309185 even more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1901 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-27 03:55:16 +00:00
Greg Wilkins
9f0592acbe 313336 secure websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1826 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-20 09:48:12 +00:00
Simone Bordet
9fbd9a912d Fix for #308867 (Update test suite to JUnit4 - Module jetty-webapp).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1773 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-13 15:55:25 +00:00
Jesse McConnell
a04456d815 revert last change to _configurationClasses which set value back to null
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1692 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 19:50:10 +00:00
Michael Gorovoy
a4d20486b2 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1688 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 16:16:24 +00:00
Greg Wilkins
5662d548f6 309153 Hide extracted WEB-INF/lib when running a non-extracted war
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1646 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 12:34:29 +00:00
Greg Wilkins
7908935011 #310382 NPE protection when WAR is not a file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1645 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 10:41:45 +00:00
Joakim Erdfelt
b7b067e7f3 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1627 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:36 +00:00
Greg Wilkins
a7fdbde808 no debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1555 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-23 15:56:54 +00:00
Greg Wilkins
338143d02f 309765 renamed JSP logging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1552 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 22:16:21 +00:00
Jan Bartel
5731200946 310051 - _configurationClasses now defaults to null in WebAppContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1547 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 11:01:01 +00:00
Greg Wilkins
392f3b088e 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps - backed out
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1510 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-14 07:34:40 +00:00
Michael Gorovoy
8c91c6c166 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1507 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-13 15:56:48 +00:00
Jan Bartel
a1742aa8a6 Allow Configuration array to be set on Server instance and then applied to all webapps.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1425 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 18:14:54 +00:00
Jan Bartel
bdb24d1de0 294799 when configuring a webapp, don't look for WEB-INF/jetty6-web.xml
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1344 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 12:27:18 +00:00
Jan Bartel
ec3a5b4f61 302669
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1266 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-15 02:40:28 +00:00
Greg Wilkins
0cd68330e8 format
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1248 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-08 22:13:34 +00:00
Greg Wilkins
52fc378b93 298667 various deployer improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1174 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-31 03:02:16 +00:00
Greg Wilkins
9825a4282b 297421 Hide server/system classes from WebAppClassLoader.getResources
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1139 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-10 21:54:06 +00:00
Jesse McConnell
101779c875 repairing build from movement of some modules to sandbox
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1051 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-17 02:34:20 +00:00
Greg Wilkins
2a3750fe1e 294563 Initial websocket implementation working
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1043 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-12 03:27:35 +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
Greg Wilkins
69159ea484 JETTY-1114
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@948 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-22 05:57:32 +00:00
Jesse McConnell
a0ba8a3bc3 resolve a uri issue with war files coming in from context.xml files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@920 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 19:48:31 +00:00
Jesse McConnell
9b029a9b42 remove the verifier from the default setup
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@886 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-11 21:31:32 +00:00
Jesse McConnell
576ee80d2a add in the verifier into the default context...not a longterm solution
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@882 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-11 17:36:57 +00:00
Jan Bartel
7605c6b1ea JETTY-1105
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@875 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-11 03:07:12 +00:00
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
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
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
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
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
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