2164 Commits

Author SHA1 Message Date
Greg Wilkins
f5d59cacca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-14 14:04:21 +10:00
Greg Wilkins
112244d6ef Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 13:44:49 +10:00
Greg Wilkins
45bbde408f Fix #708 SslContextFactory: newSslServerSocket/newSslSocket/doStart are not customized 2016-07-14 12:17:52 +10:00
Jan Bartel
700d051587 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 15:32:58 +10:00
Jan Bartel
6628a42d5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 15:32:03 +10:00
Jan Bartel
37cda79f7b Issue #720 2016-07-13 15:28:33 +10:00
Greg Wilkins
2ee64a8d56 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 11:49:00 +10:00
Greg Wilkins
8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
Greg Wilkins
322fe73869 Suppress stacks during sweeper test 2016-07-07 08:32:36 +10:00
Greg Wilkins
40f816256b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 16:48:33 +10:00
Greg Wilkins
c9e6141844 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 16:47:58 +10:00
Greg Wilkins
fc36e45795 Support UNC paths in PathResource #669
Also-by: Marco Signorini <m.signorini@iontrading.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-07-06 16:46:22 +10:00
Greg Wilkins
5b50e41e7e Issue #687
Alias should be absolute not relative
2016-07-06 16:46:22 +10:00
Jan Bartel
c3da8b27eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 13:43:52 +10:00
Greg Wilkins
f058054cbe Issue #644 Modules for logging
Added slf4j-jul
2016-07-06 12:14:22 +10: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
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
b20e2ddf18 Fixes #672 - Allow logging configuration announcement to be programmatically disabled 2016-06-28 13:01:16 -07:00
Jan Bartel
ef65639674 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 16:22:23 +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
Greg Wilkins
7df3b83a8e Issue #644 Modules for logging
Added logback classic modules
2016-06-24 14:42:34 +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
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
f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Greg Wilkins
e4eafd0fee Issue #644 Modules for logging
parameterized logging versions
2016-06-23 09:54:28 +10:00
Greg Wilkins
80903c5ab1 Issue #644 Modules for logging
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +10:00
Jesse McConnell
ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell
2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt
0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt
8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt
cce7837e64 Fixes #654 - ServletContext.getResourceAsStream("/") should return null
+ Jetty 9.2 (and earlier) used a Resource.getInputStream() implementation
   that would trigger an IOException on-construction (vs on-first-access)
   due its use of java.io.FileInputStream(File) which had a isDirectory
   check in its constructor.
 + Jetty 9.3 and onward uses java.nio.file.Files.newInputStream() which
   has the bad on-first-access behavior.
 + Changing the behavior of PathResource.getInputStream() to behave the
   same way as the prior FileResource.getInputStream(), as well as adding
   the Resource.isDirectory() check back into ContextHandler.getResourceAsStream(String)
   to prevent creation of the InputStream in the first place.
2016-06-22 09:09:05 -07:00
Jesse McConnell
030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Greg Wilkins
7a8edef808 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 23:33:45 +10:00
Greg Wilkins
d05c282baa Issue #644 Modules for enabling logging
Improved descriptions
2016-06-17 23:33:26 +10:00
Jan Bartel
003e9cd302 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 15:54:02 +10:00
Greg Wilkins
d79b0a7acd Issue #644 Modules for enabling logging
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Jan Bartel
1e7b866d6f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 13:36:56 +10:00