Commit Graph

12792 Commits

Author SHA1 Message Date
Joakim Erdfelt 6f88e74514 Merge branch 'jetty-9.4.x' 2016-06-29 15:12:53 -07:00
Joakim Erdfelt 2aa2f12eca Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:12:37 -07:00
Joakim Erdfelt ba4539b594 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-06-29 15:12:21 -07:00
Joakim Erdfelt fec314239d Merge branch 'jetty-9.4.x' 2016-06-29 15:12:02 -07:00
Joakim Erdfelt c4f6d3503e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:11:55 -07:00
Joakim Erdfelt d13d3cc3f5 Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level 2016-06-29 15:11:46 -07:00
Joakim Erdfelt 2dfb5f463a Fixes #677 - Logging of ignore() events now show as "Ignored Exception" 2016-06-29 15:11:37 -07:00
Joakim Erdfelt a5dc01bbb1 Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now 2016-06-29 15:11:28 -07:00
Joakim Erdfelt 3d988c9ff8 Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level 2016-06-29 15:10:01 -07:00
Joakim Erdfelt e2058f9787 Fixes #677 - Logging of ignore() events now show as "Ignored Exception" 2016-06-29 15:08:44 -07:00
Joakim Erdfelt dbc8352aa6 Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now 2016-06-29 15:07:43 -07:00
Jan Bartel ae4472ca28 Issue #658
Added documentation.
2016-06-29 15:46:15 +10:00
Greg Wilkins 2b8416eb8a Fixes #673 match all classpath pattern 2016-06-29 14:06:27 +10:00
WalkerWatch 1f74d10358 Fixing link and grammatical changes for JMX Dump; added updated diagram for configuration. (#666)
* Fixing link and grammatical changes.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Updating diagram of configuration elements.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-29 09:35:04 +10:00
Joakim Erdfelt ed8310dbff Merge branch 'jetty-9.4.x' 2016-06-28 13:48:12 -07:00
Joakim Erdfelt ac90d2b562 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-28 13:47:54 -07:00
Joakim Erdfelt bba1c19875 Fixes #668 - Introduce optional `jetty.deploy.defaultsDescriptorPath` for jetty-deploy defaults descriptor outside of ${jetty.home} 2016-06-28 13:44:36 -07:00
Joakim Erdfelt 1ac1673396 Fixes #667 - Alternate `jetty.deploy.monitoredDirPath` for jetty-deploy outside of ${jetty.base} 2016-06-28 13:39:28 -07:00
Joakim Erdfelt b20e2ddf18 Fixes #672 - Allow logging configuration announcement to be programmatically disabled 2016-06-28 13:01:16 -07:00
Jan Bartel 3e937c4891 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 19:11:21 +10:00
Jan Bartel 00f9b99d02 Issue #663
Fix accidental removal of arg to InfinispanTestServer.
2016-06-24 19:10:57 +10:00
Greg Wilkins 81f78bf16f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 18:40:32 +10:00
Greg Wilkins d0d11244b3 Issue #644 Modules for logging
Added module for logback-access
2016-06-24 18:40:00 +10:00
Jan Bartel ef65639674 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 16:22:23 +10:00
Jan Bartel 0889a66f9c Issue #663 2016-06-24 16:21:25 +10:00
Jan Bartel b1c62f81d9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-24 16:11:01 +10:00
Greg Wilkins 26276575e7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-24 15:40:21 +10:00
Jan Bartel 225c6a8086 Issue #663
Also fix javadoc; fix memcached module
2016-06-24 15:38:25 +10:00
Greg Wilkins 7df3b83a8e Issue #644 Modules for logging
Added logback classic modules
2016-06-24 14:42:34 +10:00
Greg Wilkins cfe5abf8e6 Issue #660 NPE in Request
Made request more robust for calls after reset.
2016-06-24 14:33:18 +10:00
Greg Wilkins 0e0fc77771 skip symlink test on windows 2016-06-24 14:33:18 +10:00
Simone Bordet 237502932a Merged branch 'jetty-9.4.x' into 'master'. 2016-06-23 13:04:06 +02:00
Simone Bordet ab45979a13 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-23 13:02:53 +02:00
Simone Bordet 9d9df416af Fixes #643 - NPE in passing websocket client test. 2016-06-23 13:00:04 +02:00
Greg Wilkins 0239d6390f Issue #644 Modules for logging
module for direct slf4j to log4j2 bridge
2016-06-23 15:32:18 +10:00
Greg Wilkins 501b8e9dca Issue #644 Modules for logging
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
2016-06-23 15:21:34 +10:00
Jan Bartel 9d71faad07 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:50:32 +10:00
Jan Bartel 4e364a5642 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 14:50:07 +10:00
Jan Bartel 0879b44d37 Issue #658
Add backoff retries for gcloud session save.
2016-06-23 14:48:47 +10:00
Jan Bartel 34aa4d078c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:19:24 +10:00
Jan Bartel 3f10652361 Allow a list of memcached servers to be configured for session caching. 2016-06-23 14:18:48 +10:00
Greg Wilkins 84b3e2e616 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 14:11:53 +10:00
Greg Wilkins e3936d2046 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 14:11:29 +10:00
Greg Wilkins c3173932f0 Revert "Issue #660 - simplifying parameter extraction to prevent NPE"
This reverts commit ecea486d07.
2016-06-23 12:43:29 +10:00
Jan Bartel 2793812fcb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:26:16 +10:00
Jan Bartel a0e7b21180 Make SessionDataMap a LifeCycle 2016-06-23 12:25:33 +10:00
Jan Bartel f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Jan Bartel 3c6dab9790 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-06-23 12:04:15 +10:00
Jan Bartel 26310f1167 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 12:03:08 +10:00
Greg Wilkins 5c7b0247e7 Issue #627 Use start.d or start.ini not both
Added --create-startd option
Improved tests
2016-06-23 12:01:07 +10:00