Commit Graph

209 Commits

Author SHA1 Message Date
Greg Wilkins 564cf7329c 365302: made map of loggers concurrent and shared in abstract 2012-01-12 20:39:24 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins cb22cfdbe5 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:06:14 +11:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jan Bartel e7b787996f Fix build. 2012-01-02 08:26:29 +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 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
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 e3fe523cc7 327725 Nested ResourceCaches
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2345 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-14 01:51:42 +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
Greg Wilkins cbc47fca80 320073 local loader
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2191 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-28 13:48:54 +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 5e49b01b93 320073 example cloud deploy
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2169 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 03:28:51 +00:00
Greg Wilkins 0443786d8e 320073 reconsile configuration mechanism
Reconsiled the jetty-8 configuration mechanism with the capability to share the MetaData between instances

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2168 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 03:20:41 +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
Joakim Erdfelt 2347b12be2 Fixing testing typo
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2001 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-15 02:44:59 +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 937d475839 310431 Default ErrorHandler as server Bean
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1566 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-26 20:15:12 +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
Greg Wilkins b5041c98c5 cleaned up imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1513 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-14 22:39:11 +00:00
Jan Bartel a42b954a26 308420 - convert jetty-plus.xml to use DeploymentManager
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1478 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-07 23:26:30 +00:00
Jan Bartel f971ed42ee Convert log.info statements to log.debug statements.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1423 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 18:05:16 +00:00
Jan Bartel fce49f7804 292800 - ContextDeployer - recursive setting is undone by FilenameFilter
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1346 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 13:42:18 +00:00
Jan Bartel 2b21975ab1 292799 - WebAppDeployer - start a started context?
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1345 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 12:38:02 +00:00
Greg Wilkins de841eba43 javadoc tweaks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1240 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-05 04:11:58 +00:00
Hugues Malphettes 2b09905deb fix trivial mistake that was breaking the hot-redeploy of contexts.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1221 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-28 05:59:21 +00:00
Hugues Malphettes c706695eca add logback integration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1212 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-25 04:35:24 +00:00
Joakim Erdfelt d7a8e421e1 Fixing testing on windows 7, test temp and work directory were being reused, which windows can't unlock between tests, such that the use of delete of the directory (to clean up between tests) cannot occur
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1209 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-21 18:41:30 +00:00
Greg Wilkins 6cdd30390a format
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1203 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 22:06:52 +00:00
Hugues Malphettes 0fe25eb3d7 reverted the wrong change to WebAppProvider. it was meant to be a change for OSGiAppProvider in fact.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1202 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 03:21:33 +00:00
Hugues Malphettes fdaa364ee4 cleaned the workaround now that bug 294799 is fixed. added to OSGiAppProvieder the same parameters that WebAppProvider for configuration of WebAppContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1201 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 03:13:27 +00:00
Hugues Malphettes 8cd60cd604 refactor AbstractAppProvider into ScanningAppProvider. support new deployment API for jetty OSGi. added some ways to extend the behavior of App and ScanningAppProvider
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1200 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-16 02:09:35 +00:00
Greg Wilkins eaab420027 298667 deployer cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1193 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-12 00:44:49 +00:00
Greg Wilkins ac0d3ae5e6 298667 various deployer improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1175 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-31 03:02:51 +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 8e19d18057 298667 DeploymentManager improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1173 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-30 23:45:16 +00:00
Greg Wilkins 94e6168fe6 field names
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1169 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-29 22:51:27 +00:00
Joakim Erdfelt caf4735792 Adding convenience methods
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1154 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-16 21:46:02 +00:00
Joakim Erdfelt f2b39d7bf8 Javadoc Cleanup. Get Binding fix. Updated diagrams.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1135 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-09 19:06:22 +00:00
Joakim Erdfelt 5c48784e86 Making AppLifeCycle binding lazy to allow for multiple xml configuration
scenario.  Cleaning up GraphOutputDot to sort 'undeployed' at top of
graph for readabilities sake.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1134 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-08 22:17:33 +00:00
Greg Wilkins 07d9656136 some simplifications of the graph classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1133 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-08 12:34:44 +00:00
Joakim Erdfelt 02c44adede Simplifying graph, adding GraphOutput, and graph modification methods.
* Simplifying graph by removing pre-* nodes from default
* Adding GraphOutput interface to output graph to whatever you want
* Adding GraphOutputDot to dump graph to graphviz dot file format
* Adding new Graph.insert(Edge,Node) to allow for arbitrary graph
  modification.
* Changing Graph.getPath() to return NodePath instead of List<Node> to
  give some routines to get an Edge on the path via an index.
* Modifying test case to show Graph.insert(Edge,Node) in use, along with
  new NodePath Graph.getPath() behavior.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1132 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-07 22:39:41 +00:00
Joakim Erdfelt 3e91339db5 Adding Jetty DeploymentManager to jetty.xml as default deployer with
standard configuration to mimic the legacy deployer behavior.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1131 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-07 20:39:49 +00:00
Joakim Erdfelt a0e7a295ce Moving out optional components to appropriate sandbox artifacts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1125 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-04 22:18:35 +00:00
Joakim Erdfelt 815e822aa9 Merging jetty-deploy-manager-graph from sandbox to trunk jetty-deploy.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1124 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-04 21:59:58 +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 45953ed582 289959 improved ContextDeployer configuration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@939 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-21 05:39:39 +00:00
Greg Wilkins 62c605f802 JETTY-1074 JMX thread manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@627 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-04 07:36:49 +00:00
Greg Wilkins f4bea1ebc3 JETTY-1054 Avoid double deploys
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@441 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-27 03:46:09 +00:00
Jan Bartel f3926b4bf7 Ensure context attributes are copied, not passed by reference to each new context.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@324 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-01 03:22:28 +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 c555b7a0bf more JMX fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@178 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 06:17:24 +00:00
Greg Wilkins afa399375a removed confusing addHandler form HandlerWrappers
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@56 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-31 22:14:29 +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