Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,985 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

137 Commits

Author SHA1 Message Date
Jesse McConnell 7346476c92 Merge branch 'jetty-9.4.x' 2016-07-20 15:18:23 -05:00
Jesse McConnell 4a2d471537 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-20 15:17:57 -05:00
WalkerWatch 77a8556ffe Updates images for chapter 14. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 16:11:49 -04:00
WalkerWatch 92af8eb8fc Updates for Chapter 14. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 16:09:01 -04:00
Simone Bordet f068780749 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-20 13:19:15 +02:00
Simone Bordet 11d0569a75 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-20 13:18:26 +02:00
Simone Bordet c09251fbaf Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:17:31 +02:00
Jesse McConnell af007da091 resolve merge conflict 2016-07-19 14:35:01 -05:00
Jesse McConnell 9071456f8f resolve merge conflict 2016-07-19 14:32:50 -05:00
WalkerWatch 45d4415781 Chapter 13 clean up and addition of {MVNCENTRAL} attribute. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-19 15:02:33 -04:00
Simone Bordet 491be7505b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-19 10:34:59 +02:00
Simone Bordet 0d8f1b9e69 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-19 10:34:19 +02:00
WalkerWatch 554d0ab4c1 Chapter 12 Updates (#738) 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-19 08:42:52 +10:00
WalkerWatch 087fd07007 Chapter 12 Updates 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-18 16:37:37 -04:00
Jesse McConnell 0c1cfb350c Merge branch 'jetty-9.4.x' 2016-07-15 14:32:56 -05:00
Jesse McConnell 8718f4e1bf Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-15 14:32:30 -05:00
WalkerWatch 7ba4e9c8d2 Minor edits to RequestLog documentation. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-15 13:29:22 -04:00
WalkerWatch 00b3738536 Updated RequestLog xml/module/documentation. Resolves #734 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-15 13:08:30 -04:00
Jesse McConnell bb7912a9d0 Merge branch 'jetty-9.4.x' 2016-07-14 13:29:51 -05:00
Jesse McConnell d178f23ec7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:29:38 -05:00
Jesse McConnell 37d0caedee Merge pull request #728 from WalkerWatch/jetty-9.3.x 
Fixing SRCDIR references.
 2016-07-14 11:28:47 -07:00
WalkerWatch ff200043de Fixing SRCDIR references. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-14 14:25:20 -04:00
Jesse McConnell 4455cc7cfb set to proper location 2016-07-14 13:19:20 -05:00
Jesse McConnell 300641c0e6 Merge branch 'jetty-9.4.x' 2016-07-14 13:18:52 -05:00
Jesse McConnell 73d546ceac update for proper branch 2016-07-14 13:18:34 -05:00
Jesse McConnell 37015b8536 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:18:03 -05:00
Jesse McConnell 312028df15 Update pom.xml 2016-07-14 13:17:10 -05:00
Jesse McConnell 255e2bbf2f Merge branch 'jetty-9.4.x' 2016-07-14 12:48:45 -05:00
Jesse McConnell 55d9ba9307 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 12:47:43 -05:00
Jesse McConnell 1000ba52e0 Merge pull request #719 from WalkerWatch/jetty-9.3.x 
Chapter 9 cleanup and removed doc reference to disablejsr for #706.
 2016-07-14 10:45:48 -07:00
WalkerWatch 49f55cf5fc Removed references to Glassfish, updated Java versions. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-14 08:12:10 -04:00
WalkerWatch a17dd2775c Chapter 9 part II 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-13 15:45:13 -04:00
Simone Bordet f554f2ac3b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-13 12:36:25 +02:00
Simone Bordet 92b0be6f69 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-13 12:35:38 +02:00
Simone Bordet 22c78d79f0 Fixes #718 - Document HttpClient transports. 2016-07-13 12:35:12 +02:00
WalkerWatch b041ecbe76 Removing doc reference to disablejsr for #706. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-12 21:12:52 -04:00
Joakim Erdfelt ba761071f3 Merge branch 'jetty-9.4.x' 2016-07-12 17:50:37 -07:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 27195a3b04 Merge pull request #712 from WalkerWatch/jetty-9.3.x 
Chapter 8 and 9 cleanup.
 2016-07-12 16:32:35 -07:00
WalkerWatch 00551d73b2 Chapter 9 clean up and fixes Part I 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-12 19:12:15 -04:00
Simone Bordet c77562bc95 Issue #684 - HttpClient proxies (HttpProxy and Socks4Proxy) do not support authentication. 
The feature was already present, improved documentation.
 2016-07-12 23:22:43 +02:00
Joakim Erdfelt c3bcce1ce4 Merge branch 'jetty-9.4.x' 2016-07-12 11:44:57 -07:00
Joakim Erdfelt bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
WalkerWatch 83d99159f6 First pass of Chapter 8 cleanup. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-11 17:49:59 -04:00
WalkerWatch aa6685e1f8 Chapter 7 clean up, prose fix. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-11 16:45:23 -04:00
Joakim Erdfelt 7ec1f26d1a Merge branch 'jetty-9.4.x' 2016-07-11 10:32:44 -07:00
Joakim Erdfelt bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
WalkerWatch ced94f0eb8 Chapter 6 fixes, removal of Quickstart pieces for #679. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-08 16:37:54 -04:00
Joakim Erdfelt eadd78164f Merge branch 'jetty-9.4.x' 2016-07-08 08:45:56 -07:00
Joakim Erdfelt 66dfe7a5c2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-08 08:45:39 -07:00