Commit Graph

84 Commits

Author SHA1 Message Date
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jan Bartel 081071b42c JETTY-1489 WebAppProvider attempts to deploy .svn folder 2012-03-02 16:19:07 +11:00
Greg Wilkins 564cf7329c 365302: made map of loggers concurrent and shared in abstract 2012-01-12 20:39:24 +11:00
Greg Wilkins cb22cfdbe5 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:06:14 +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 fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Jan Bartel 7e00a1d13c 358687 Updated jsp does not scan for system tlds
Fixed pattern.
2011-09-23 14:56:07 +10:00
Jan Bartel 8d6f64c902 358687 Updated jsp does not scan for system tlds 2011-09-23 14:51:25 +10:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt 3399242d83 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -07:00
Jan Bartel 236bd193e0 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
2011-07-11 14:54:23 +10:00
Jan Bartel 86f7e76c4d Merge of jetty-7 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-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-nested/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.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-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	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-07-11 12:05:58 +10:00
Michael Gorovoy 8babf3ae17 351576 Do not use deprecated method File.toURL() 2011-07-08 17:21:02 -04: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
Michael Gorovoy 9235b429bb 347468 o.e.j.deploy.binding.GlobalWebappConfigBindingTest fails on Windows platform
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3432 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-28 18:00:19 +00:00
Jesse McConnell 6574fc33cb organize imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3227 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 21:29:21 +00:00
Jesse McConnell ef3feecb52 Bug 346764 added new binding that provides ordered execution of bindings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3226 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 20:54:25 +00:00
Jesse McConnell 8f257c6fd8 Bug 345729 add license info and comment
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3211 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:43:13 +00:00
Jesse McConnell 310cc72448 Bug 345729 change name of key classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3210 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:35:43 +00:00
Jesse McConnell a85e00f3ff Bug 345729 remove previous solution in lew of more general approach allowing for the application of a jetty-web.xml type file to all contexts in the binding phase
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3208 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 20:01:09 +00:00
Jesse McConnell 5f01e2428b Bug 345729 add binding that can allow for global management of server and system classes for webapp contexts, added 2 gettings on webappcontext for getting default server and system class settings.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3143 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 20:22:12 +00:00
Greg Wilkins 2213919ca5 345047 Readded deprecated ScanningAppDeployer#setMonitoredDir
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3102 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 01:35:34 +00:00
Greg Wilkins 793872d253 deprecated methods
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3000 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-12 03:51:51 +00:00
Greg Wilkins d3c5eddd79 342504 Scanner Listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2999 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-12 02:12:52 +00:00
Michael Gorovoy 89ccbc7689 338819 Externally control Deployment Manager application lifecycle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2865 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 15:18:48 +00:00
Greg Wilkins bdc1aa6c24 338819 backed out for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2860 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 04:21:25 +00:00
Michael Gorovoy 266195cc0b 338819: Externally control Deployment Manager application lifecycle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2856 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-05 02:54:15 +00:00
Greg Wilkins d77069a8ea 338607 improve destruction of handlers
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2845 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-02 01:19:32 +00:00
Joakim Erdfelt c658040eca Refreshing the jetty-deploy diagrams
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2837 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-01 17:03:20 +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 6f0b83a272 333679 Refactored jetty-jmx. Improved deployer mbeans
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2630 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 21:35:22 +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 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 312cf416ec minor cleanups and test improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2603 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-09 16:49:46 +00:00
Greg Wilkins 095d728f31 improved help and debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2490 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:04:14 +00:00
Greg Wilkins 75d9d18b50 329642 Concurrent modification exception in Deployment Manager
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2473 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-07 23:37:19 +00:00
Greg Wilkins 543118f837 329410 Enforce XmlConfiguration properties as Map<String,String>
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2469 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-04 02:08:49 +00:00
Greg Wilkins eb377e72e1 removed silly include
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2458 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-01 06:58:14 +00:00
Jan Bartel 9d901da82e JETTY-1295 Contexts mixed up when hot-deploying on virtual hosts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2427 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-28 03:18:21 +00:00
Greg Wilkins 5cdb4bb819 328523 Fixed overloaded setters in AppProvider
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2389 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-23 07:02:17 +00:00
Greg Wilkins 996ff90660 328306 Serialization of FormAuthentication
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2380 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 09:58:13 +00:00
Greg Wilkins 16caeeb478 320073 template deployments
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2203 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-03 00:41:57 +00:00
Joakim Erdfelt c9db2c9620 311550 The WebAppProvider should allow setTempDirectory
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2000 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-14 22:19:08 +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
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 463b275cb7 310094 use only Property in xml configs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1551 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 17:18:32 +00:00
Greg Wilkins 4fe6fa388f 310094 Improved start.jar usage and config files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1548 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 12:59:40 +00:00