Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,829 Commits 70 Branches 465 Tags 360 MiB
Commit Graph

103 Commits

Author SHA1 Message Date
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 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
 2011-08-12 18:43:15 +10:00
Jesse McConnell 3d9ebd7803 Disconnecting test for mac since build server apparently has issues 
finding itself
 2011-08-03 12:20:26 -05: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
Michael Gorovoy 28a0c0ff75 350287 Disable ScanningAppProviderRuntimeUpdatesTest on Windows 
This reverts commit 2edcef1343eca17e300dc1cd7fedcabf17c2baf6.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3427 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-06-25 01:21:01 +00:00
Michael Gorovoy dbd782dfbc 350287 ScanningAppProviderRuntimeUpdatesTest fails on Windows 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3426 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-06-24 22:50:15 +00:00
Michael Gorovoy c9b934ce56 345729 Fixed test failure on Windows XP 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3297 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-27 02:15:05 +00:00
Joakim Erdfelt ec5b98db58 Moving xml-configured-jetty.properties file creation into jettyHome for testing on windows reasons 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3294 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-27 01:10:45 +00:00
Joakim Erdfelt 2526693ba3 Making test more robust for debugging windows build error. 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3290 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-26 22:53:59 +00:00
Joakim Erdfelt 52820832a1 Making test more clear on assertion and failure (to help with windows failure) 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3259 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-25 22:26:37 +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 b1edad57e4 Bug 345729 change example around to call as opposed to set 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3209 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-18 21:34:22 +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 07462afa38 another attempt to make this work on windows 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3012 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-04-13 01:34:41 +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
Greg Wilkins 9b01e9324e better test timing 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2974 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-04-05 02:42:14 +00:00
Greg Wilkins 1bd0adabfb 340949 Scanner delays file notifications until files are stable 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2948 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-04-01 02:18:18 +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 acc4f230fc Merging back /branches/jetty-bug-296978 revs 2674:HEAD 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-01-28 18:58:47 +00:00
Michael Gorovoy d6923903cb 331803: Update XML configuration files to use proper arguments for startup commands in examples 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2698 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-01-26 16:24:35 +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 6ca798c49a improved test timing 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2523 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-11-16 23:53:42 +00:00
Greg Wilkins 57a8287da7 330210 Improve performance of writing large bytes arrays 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2507 7e9141cc-0065-0410-87d8-b60c137991c4
 2010-11-15 11:57:53 +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