Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,498 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

208 Commits

Author SHA1 Message Date
Greg Wilkins 8d380220c4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 10:35:37 +10:00
WalkerWatch 5a1263b4bd Docupdates/jetty runner (#772) 
* Updates to Servlets/Filters/Handlers in Chapter 17.

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

* Jetty Runner doc updates.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-27 10:28:40 +10:00
Jesse McConnell de2465d0dd Merge branch 'jetty-9.4.x' 2016-07-26 07:53:55 -05:00
Jesse McConnell e9140a30b2 merging 9.3 to 9.4 2016-07-26 07:53:17 -05:00
Jesse McConnell 0adee58367 Merge pull request #769 from WalkerWatch/jetty-9.3.x 
Fixing doc rendering issue.
 2016-07-26 07:51:46 -05:00
Jesse McConnell 043b494c57 Merge pull request #763 from WalkerWatch/docupdates/chapter17 
Chapter 17 cleanup.
 2016-07-26 07:51:38 -05:00
WalkerWatch 288ebe8d30 Fixing doc rendering issue. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-26 08:48:03 -04:00
Jesse McConnell 42d1647413 Merge branch 'jetty-9.4.x' 2016-07-22 17:32:47 -05:00
Jesse McConnell f3fe72a708 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 17:32:27 -05:00
WalkerWatch 232ca5b1d8 Resolves #764." 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-22 18:14:14 -04:00
WalkerWatch e368f3d8ee Chapter 17 cleanup. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-22 14:53:18 -04:00
Jesse McConnell bfeedc6f5e Merge branch 'jetty-9.4.x' 2016-07-22 12:09:00 -05:00
Jesse McConnell 85af98b483 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-22 12:08:40 -05:00
Jesse McConnell e800e616d6 Merge pull request #758 from WalkerWatch/docupdates/chapter16 
Chapter 16 updates
 2016-07-22 12:08:11 -05:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
WalkerWatch 7c9f3ec727 Chapter 16 updates 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-21 17:19:25 -04:00
WalkerWatch 127028d4d9 Chapter 15 cleanup 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-21 12:34:30 -04:00
Simone Bordet 98454b8726 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 17:50:51 +02:00
Simone Bordet cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00
WalkerWatch fa24eb3541 Resolves #747. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 18:14:47 -04:00
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
Joakim Erdfelt 2cfc5b1665 Merge branch 'jetty-9.4.x' 2016-07-08 08:40:28 -07:00
WalkerWatch e4807076b2 Resolves #701 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-08 10:47:49 -04:00
Greg Wilkins 16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
WalkerWatch db9a8dc962 Updates to Intro, Chapter 5 and ResourceHandler example for #687. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-07 16:34:58 -04:00
WalkerWatch f73423be9c Chapter 4 updates and corrections. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-07 12:41:14 -04: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
WalkerWatch c96e58fa37 Chapter 2 and 3 updates. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-06 14:00:50 -04:00
Jan Bartel ca0c7eb85c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-05 18:01:55 +10:00
Jan Bartel 44e95a2fcd Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-05 18:01:13 +10:00
Joakim Erdfelt 173a5d8724 Merge pull request #683 from WalkerWatch/jetty-9.3.x 
Updated Chapter listing & misc changes
 2016-07-01 08:52:48 -07:00
WalkerWatch 2214dda719 Merge branch 'jetty-9.3.x' of https://github.com/WalkerWatch/jetty.project into jetty-9.3.x 2016-07-01 11:25:55 -04:00
WalkerWatch f830bb35d5 Updated chapter listing 
Signed-off-by: WalkerWatch <chris@webtide.com>
 2016-07-01 11:23:43 -04:00
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
Jan Bartel ae4472ca28 Issue #658 
Added documentation.
 2016-06-29 15:46:15 +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
WalkerWatch 9ce27beb3b Updating diagram of configuration elements. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-25 20:55:41 -04:00
WalkerWatch aa054c85af Fixing link and grammatical changes. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-25 20:44:22 -04: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 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 8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10:00
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
WalkerWatch 69804f9e76 Chapter 24 touch-ups. (#635) 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-06-15 15:55:11 +10:00
Jesse McConnell c6172c9f2e Merge branch 'jetty-9.4.x' 2016-06-09 14:18:52 -05:00