Commit Graph

2162 Commits

Author SHA1 Message Date
Greg Wilkins bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +11:00
Joakim Erdfelt 08012355de Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 14:45:55 -07:00
Joakim Erdfelt 9f317dee94 Issue #1051 - Using java.time.ZonedDateTime instead of java.util.Calendar for Java 1.8+ 2016-11-17 14:44:58 -07:00
Joakim Erdfelt 1003969468 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 11:04:40 -07:00
Joakim Erdfelt bfadca49b5 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-16 13:56:31 -07:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Greg Wilkins fe1704c89a javadoc 2016-11-10 13:56:33 +11:00
Joakim Erdfelt de18e4540b Issue #1051 - RolloverFileOutputStream doesn't handle DST properly 2016-11-07 09:55:09 -07:00
Jesse McConnell 9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Greg Wilkins c6436c34ad Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-03 16:56:21 +11:00
Greg Wilkins 3dc2637d21 Issue #1063 Accept empty host 2016-11-03 15:06:32 +11:00
Jan Bartel 7790234589 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-02 15:42:03 +11:00
Jan Bartel ca882c8dee Issue #240
No error if no parts because input stream already consumed.
2016-11-02 15:40:59 +11:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Jan Bartel da853574f6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-28 14:41:37 +11:00
Jan Bartel 6f6ccdf061 480764 Add extra tests for empty multipart. 2016-10-28 14:41:05 +11:00
Simone Bordet c6ad87c3f9 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-27 16:55:12 +02:00
Simone Bordet 8cefaba2a4 Allow process() to throw Throwable, which we catch anyway. 2016-10-27 15:43:12 +02:00
Greg Wilkins 726fcd814c fixed simple-impl naming #1023 2016-10-22 10:56:50 +11:00
Greg Wilkins 9569ff64c9 removed unnecessary dependency #1020 2016-10-22 10:34:14 +11:00
Greg Wilkins 97470c4736 Overlay directories for modules #1013
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
Jan Bartel d3deeff32c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-20 12:39:33 +11:00
Greg Wilkins d7b781574d Improve logging modules and listing #984
All logging modules log to stderr
2016-10-20 10:57:56 +11:00
Greg Wilkins 1706c6d9ed Improve logging modules and listing #984
Do not support JCL as a logging mechanism.  Only support jcl-slf4j binding
2016-10-20 10:57:56 +11:00
Joakim Erdfelt 93741c32a8 Merge branch 'jetty-9.4.x' 2016-10-19 16:17:36 -07:00
Greg Wilkins 6bc8717053 Improve logging modules and listing #984
Trim provider list and accept as default if only 1 available
2016-10-20 10:06:52 +11:00
Joakim Erdfelt 4dfd3fad73 Fixing log4j.properties -> log4j.xml 2016-10-19 14:24:54 -07:00
Joakim Erdfelt 15d00767a5 Using ${jetty.logging.dir} consistently 2016-10-19 14:23:54 -07:00
Joakim Erdfelt 36d75d4c4f Merge branch 'jetty-9.4.x' 2016-10-19 10:59:28 -07:00
Joakim Erdfelt d9054d24b3 Issue #984 - minor cleanup, consistency across all modules
+ Also correcting filename jcl-simple-impl.mod
2016-10-19 10:25:44 -07:00
Simone Bordet 6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Simone Bordet d07d78066e Moved console-capture.xml from modules/console-capture/ to etc/.
This is needed to ease migrations from Jetty 9.3.x, that otherwise
won't be able to find that file.
Furthermore, it's a file that will be rarely modified, since it can
be tuned via properties in start.ini.
Finally, it needs to be in etc/ if it is to be referenced by jetty.conf.
2016-10-19 16:01:16 +02:00
Simone Bordet ae240b9c17 Fixed properties in *.mod and *.xml for module console-capture. 2016-10-19 11:44:13 +02:00
Greg Wilkins 631437060b Improve logging modules and listing #984
Improved logging dependencies
2016-10-19 17:29:39 +11:00
Greg Wilkins a32923b66e Improve logging modules and listing #984
added jul-slf4j
updated logging dependencies
2016-10-19 16:25:18 +11:00
Greg Wilkins 08be6aca91 Improve logging modules and listing #984
renamed simple implementation modules.
2016-10-19 16:25:18 +11:00
Greg Wilkins 7bbfd618e3 Improve logging modules and listing #984
Used the term 'logging binding' instead of 'logging bridge'
2016-10-19 16:25:18 +11:00
Greg Wilkins 9cdfdf34a7 Improve logging modules and listing #984
renamed stderout-capture to console-capture
2016-10-19 16:25:18 +11:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Greg Wilkins b11757a1e2 Issue #984 Improve module listing
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
Greg Wilkins d9c2352966 Issue #984 Improve module listing
improved logging of file copies
renamed stderrout-logging to stderrout-capture
2016-10-14 10:17:39 +11:00
Greg Wilkins 91f708b9f6 Issue #984 Improve module listing
Use stderrout-logging for jcl-impl
2016-10-14 08:26:41 +11:00
Greg Wilkins cfed44fa7d Issue #984 Improve module listing
Made jul-impl a dependency of logging-jul
2016-10-14 08:18:15 +11:00
Greg Wilkins 85e87322fb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 16:37:51 +11:00
Greg Wilkins fa3603a739 Issue #984 Improve module listing
Logback file handler
2016-10-13 16:37:24 +11:00
Greg Wilkins 0966036fbc Issue #984 Improve module listing
Fixed server classes property
2016-10-13 16:37:24 +11:00
Greg Wilkins d5a4f0f6d4 Issue #984 Improve module listing
Simplified start.jar ini mechanism
updated logging modules to have file handlers
2016-10-13 16:37:24 +11:00