fce8ec33fc
Resolves #1453
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-04-05 16:16:46 -04:00
3aeb8dbd78
Merge remote-tracking branch 'origin/jetty-9.4.x'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
2017-04-05 06:47:25 -07:00
f90976f635
Version reminder and misc cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-04-04 16:25:03 -04:00
d841dba997
Documentation updates for #1437
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-04-03 11:04:11 -04:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
08f351b0fd
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-16 11:55:29 -07:00
dcfbdf3d33
Minor formatting updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-15 15:21:39 -04:00
c2887d0b14
Updating commit instructions.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-09 15:35:00 -05:00
e7de3ee662
Resolves #856 and updates exisitng doco.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-09 11:26:59 -05:00
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
18d036c244
Start.jar doco update for 9.3
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-03-02 12:09:05 -05:00
c705c3fd98
Fixed link and some general clean up.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-02-27 12:40:56 -05:00
08f67ca434
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2017-02-24 16:41:02 -05:00
5950514f87
resolves #1339
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-02-24 16:39:41 -05:00
8f41d89a02
Merge pull request #1347 from WalkerWatch/issues/1319
...
Issue #1319 - Documentation
2017-02-24 14:35:44 -07:00
ee352d0d19
Issue #1319 - Documentation
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-02-22 09:37:51 -05:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
ebfa822e83
Merged branch 'jetty-9.4.x' into 'master'.
2017-02-07 22:31:26 +01:00
83397d1ecf
Merge pull request #1312 from WalkerWatch/doco/uber
...
Further clarification for jetty-all
2017-02-07 14:21:48 -07:00
dcc79a5ecf
Further clarification for jetty-all
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-02-07 16:12:42 -05:00
9209268498
Merge pull request #1303 from ctron/feature/enh_maven_plugin_1
...
Allow to externally provide 'daemon' parameter
2017-02-07 09:04:50 -07:00
0f19cb7e97
Allow to externally provide 'daemon' parameter
...
This change allows to provide the 'daemon' parameter using a property
using "-Djetty.daemon" in addition.
Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-06 16:17:30 +01:00
70cd294ddd
Fix wrong artifact ID of maven plugin
...
This change fixes a location in the documentation where the artifact ID
of the plugin was still `maven-jetty-plugin`, where it should be
`jetty-maven-plugin`.
Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-06 15:39:39 +01:00
901b46fff5
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-03 06:35:11 -07:00
9479c386e8
Some updates to start doco.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-02-02 15:27:56 -05:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
0d8d754772
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 18:55:08 +01:00
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
a49841f308
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 17:28:36 +01:00
6222ccba14
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 17:28:18 +01:00
d8aafea4b4
Fixes #1272 - Update ALPN versions for 8u111.
...
Updated ALPN table for 8u111 and 8u112.
2017-01-18 17:14:23 +01:00
a684c028b5
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Specified Maven Assembly Plugin version only in root POM.
2017-01-13 22:50:08 +01:00
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
192c0b3069
Issue #1231 - Updating examples.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-01-10 10:53:56 -05:00
0ee5f18ed9
Issue #1230 - Updated dtd reference.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-01-10 10:39:46 -05:00
a51f800054
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-10 15:07:26 +01:00
eeec6bfd9a
Doc fix for download links.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-01-09 08:59:10 -05:00
7f7a85b5c9
Clarfying Jetty Home v Base
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-01-03 08:52:57 -05:00
755de58ab6
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-03 11:01:05 +01:00
bfc21f23e0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 13:33:41 -07:00
3b04817fe9
Update for Log Latency
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-27 13:25:47 -05:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
b5d2b73f07
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-20 11:55:39 +01:00
df986acaeb
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-20 11:55:15 +01:00
4669cc70c8
Merge pull request #1180 from WalkerWatch/issues/1061
...
Issue #1061 Documentation
2016-12-19 12:59:45 -07:00
b53e8cb832
Merge pull request #1176 from WalkerWatch/jetty-9.3.x
...
Version updates.
2016-12-19 12:59:10 -07:00
8aacd26e75
Documentation changes for WatchService.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 13:20:35 -05:00
8874179f55
Corrected versions
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 12:58:52 -05:00
d3ce624d9a
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-17 18:38:52 +01:00
02ccbefb8a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-17 18:38:16 +01:00
f3a4ab1ae7
Fixes #1186 - Where can i find SocketConnector.java and BlockingChannelConnector.java etc?
2016-12-17 18:37:17 +01:00
1c16964118
Merge branch 'jetty-9.4.x'
2016-12-16 08:38:16 -07:00
d6c7f99d85
Issue #1061 Documentation
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-15 13:53:17 -05:00
54cdac49fe
Resolves #981
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-15 12:01:14 -05:00
b2162cb347
Merge pull request #1159 from WalkerWatch/issues/1139
...
Issue #1139 - Documented new features and misc cleanup.
2016-12-14 13:10:28 -07:00
569eaa20b5
Version updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-14 12:22:43 -05:00
ff804b6445
Issue #1139 - Documented new features and misc cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-09 15:15:39 -05:00
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
8ea15f4214
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 20:17:20 +11:00
4ff441a8b1
Issue #1112 - Doc update. ( #1147 )
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-08 18:11:07 +11:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
2bb88f566f
Merge branch 'jetty-9.4.x'
2016-12-02 15:50:52 -06:00
df6a46e380
Merge pull request #1126 from WalkerWatch/docupdates/moresessions
...
Misc doc updates/fixes.
2016-12-02 15:50:21 -06:00
3e43ffe641
Issue #1138 - Doc updates and cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-30 13:38:17 -05:00
df91fc1092
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-25 09:05:51 +01:00
76b7686bc7
Issue #1117
2016-11-25 14:48:55 +11:00
3fe173232f
Misc doc updates/fixes.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-23 15:43:11 -05:00
d28802ad62
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-23 14:56:55 +11:00
b839f40721
Add more session doc
2016-11-23 14:56:30 +11:00
51ac6dd469
Issue #1092 Documentation updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-18 14:14:54 -05:00
7d327ffeb7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-16 10:57:25 +11:00
0ff1cf885e
Merge pull request #1089 from WalkerWatch/upgrading/sessions
...
Updates for sessions upgrade, misc doc cleanup.
2016-11-16 10:56:41 +11:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
0c16cdaaf5
Updates for GCloud sessions.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-15 14:09:43 -05:00
9ade6747d8
Update gcloud datastore doc
2016-11-11 10:26:56 +11:00
0ebe3d7bd9
Updates for sessions upgrade, misc doc cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-10 16:11:17 -05:00
ad33739206
Add doc on session configuration use cases.
2016-11-09 17:31:21 +11:00
fcab745e77
Doc on upgrading 9.3 to 9.4
2016-11-05 11:59:06 +11:00
a490ba88a8
Merge pull request #1059 from WalkerWatch/issues/1026
...
Issue #1026 - Added documentation.
2016-11-04 10:29:01 -07:00
377d823396
Merge pull request #1058 from WalkerWatch/upgrade/arrayqueue
...
Issue #1041 - Document removal of ConcurrentArrayQueue as described i…
2016-11-04 10:28:49 -07:00
f330f19653
OSGi doc formatting cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-02 14:54:37 -04:00
2b5bea3ab0
Issue #1026 - Added documentation.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-02 13:34:19 -04:00
b9fad97d0e
Issue #1041 - Document removal of ConcurrentArrayQueue as described in #966 .
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-02 13:08:56 -04:00
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
5fc6c8ee14
Issue #1041 - Small updates to documentation.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-28 13:03:53 -04:00
e7ce13d195
Doc on upgrading 9.3 to 9.4
2016-10-28 16:51:00 +11:00
2552f2300b
Updates for upgrading guide.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-26 15:16:17 -04:00
7d4b46cef4
Issue #644 Additional documentation for updated logging modules.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-23 11:57:05 -04:00
fccffdb526
Merge branch 'release-9.3.13' into jetty-9.3.x
2016-10-20 09:25:57 -07:00
d3deeff32c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-20 12:39:33 +11:00
b08fa971a5
Improve logging modules and listing #984
...
Remove support for JETTY_LOGS
2016-10-20 11:02:06 +11:00
93741c32a8
Merge branch 'jetty-9.4.x'
2016-10-19 16:17:36 -07:00
167f6c8d23
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-19 16:17:25 -07:00
54db1f48db
Merge pull request #1012 from WalkerWatch/issues/modlisting
...
Issue #984 documentation updates.
2016-10-19 13:09:47 -07:00
883c32994f
Merge pull request #996 from WalkerWatch/issues/644
...
Issue #644 Documentation updates
2016-10-19 13:09:37 -07:00
c512c3167a
Merge branch 'jetty-9.3.x-docs-ssl' of git://github.com/shauway/jetty.project into shauway-jetty-9.3.x-docs-ssl
2016-10-19 13:08:20 -07:00
7ddc679a6e
Issue #644 Documentation updates
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-19 14:47:55 -04:00
36d75d4c4f
Merge branch 'jetty-9.4.x'
2016-10-19 10:59:28 -07:00
1e6db80f91
Issue #984 documentation updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-19 13:27:26 -04:00
dfc332bc14
Initial draft of the migration guide.
2016-10-19 19:05:15 +02:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
08dc20476b
fix jolokia on merge from 9.4.x
2016-10-12 09:48:02 -05:00
ba8c9ed178
Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into issues/644
2016-10-12 10:40:45 -04:00
c066b32fb3
Work for new logging documentation
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-07 13:25:48 -04:00
bcc29de3eb
Merged branch 'jetty-9.4.x' into 'master'.
2016-10-06 16:37:43 +02:00
f2beb54caf
Issue #896
2016-10-06 17:43:37 +11:00
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
3234e243a4
Merge branch 'jetty-9.4.x'
2016-09-29 11:23:56 -05:00
5a0b0d96f9
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-29 11:23:34 -05:00
e95d14a11e
Merge branch 'jetty-9.4.x'
2016-09-29 11:21:42 -05:00
896438eb45
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-29 11:21:16 -05:00
c1c42f6b73
Updates quickstart docs for #896
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-29 11:57:53 -04:00
260cb3ce41
Resolves #965
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-29 09:44:47 -04:00
2614105e1b
Merge branch 'jetty-9.4.x'
2016-09-27 09:35:25 -05:00
16b98efd7e
Resolves #930
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-27 09:34:12 -05:00
c0d053295f
Resolves #930
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-23 12:17:17 -04:00
5b22fda629
Optimize two way authentication configuration
...
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-23 10:37:49 +08:00
f3b3d4a2ff
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-22 21:57:46 +02:00
9551d0f62b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-22 21:57:12 +02:00
4edc50b59f
Fixes #948 - 9.4.0.RC0 jetty-distribution invalid config etc/jetty-http2c.xml.
...
Updated references to deprecated property initialStreamSendWindow
with initialStreamRecvWindow.
2016-09-22 21:48:08 +02:00
f783e8df78
Merge branch 'jetty-9.4.x'
2016-09-22 11:36:48 -05:00
15866e6187
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-22 11:36:31 -05:00
2dc45f3780
Update what-version.adoc
2016-09-22 11:36:03 -05:00
83d39e4141
Merge branch 'jetty-9.4.x'
2016-09-22 11:08:02 -05:00
48a455c6aa
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-22 11:07:42 -05:00
94324c82f0
Two way authentication configuration ( #925 )
...
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-22 11:05:02 -05:00
9d23147d19
Merge pull request #916 from WalkerWatch/docupdates/Sessions
...
Further updates to Sessions documentation
2016-09-22 11:02:03 -05:00
cdb86f810d
Further updates to Sessions documentation
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-22 11:55:53 -04:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
92025e31fe
Two way authentication configuration ( #925 )
...
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-15 15:56:36 +10:00
eb78d5e2c3
Merged branch 'jetty-9.4.x' into 'master'.
...
Removed deprecated ConnectorStatistics class and its usages.
2016-09-14 17:28:51 +02:00
14e000428f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-14 17:26:00 +02:00
cb89ea8466
Fixes #131 - Improve Connector Statistic names and values.
...
Removed references to deprecated ConnectorStatistic in favor of
ConnectionStatistics.
2016-09-14 17:24:45 +02:00
32ca2ff973
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-08 07:43:23 +10:00
f0e270c380
Updates for 9.4 Sessions
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-07 10:41:38 -04:00
ea55f945be
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-07 10:36:47 +10:00
f08fc31e9d
Additional Sessions documentation for 9.4.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-06 14:35:00 -04:00
bdf26da0c0
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-05 23:12:44 +02:00
297c5ba762
Resolves #653 . ( #873 )
...
* Resolves #653 .
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
* Issue #653 updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-05 19:07:04 +10:00
291c7e9ba9
Merge branch 'jetty-9.4.x'
2016-09-02 10:57:56 -05:00
ecbac9ea55
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-02 10:57:30 -05:00
96bde3263a
fix up documentation after the docbx-maven-plugin changed where it generated source
2016-09-02 10:57:02 -05:00
32f1b30901
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-02 14:58:08 +10:00
25574d2843
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-09-02 14:57:44 +10:00
20cd7bcb35
Resolves #872 and cleans up XML chapter. ( #891 )
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-02 12:16:19 +10:00
d100ed16a4
Merge branch 'jetty-9.4.x'
2016-08-26 14:37:18 -05:00
174a3bc9be
merge 9.3.x
2016-08-26 14:35:49 -05:00
635cdc628d
Resolves #860
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-22 11:47:18 -04:00
d3f725637c
Updating docbkx-maven-plugin version
2016-08-19 13:41:41 -07:00
6d9b02a897
Merge branch 'jetty-9.4.x'
2016-08-18 14:37:16 -05:00
c80fe2b0b9
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-08-18 14:34:57 -05:00
2b9a4ead3d
Resolve #725 add page for reporting security issues
2016-08-18 13:53:08 -05:00
f2255944a1
merge 9.4.x
2016-08-18 10:09:46 -05:00
d0beca546d
merge from 9.3.x
2016-08-18 10:09:07 -05:00
2bfdc41a45
Merge pull request #849 from WalkerWatch/jetty-9.4.x
...
Clean up of Startup examples.
2016-08-18 10:06:09 -05:00
10a86e73fc
Merge pull request #852 from WalkerWatch/issues/843
...
Resolves #843
2016-08-18 10:05:54 -05:00
c1c5e76c4c
Merge pull request #838 from WalkerWatch/docupdates/Sessions
...
Sessions redux rough drafts.
2016-08-18 10:05:38 -05:00
1635bc6b12
Resolves #843
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 11:00:45 -04:00
483cc3abbf
Updates for Sessions overhaul.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-17 10:57:03 -04:00
5dbe4aa5fa
Clean up of Startup examples.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-16 16:19:55 -04:00
405de2db8f
Sessions redux rough drafts.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-12 12:59:16 -04:00
3d939de0a8
Merge branch 'jetty-9.4.x'
2016-08-10 09:59:27 -05:00
4c6f6fc290
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-08-10 09:59:04 -05:00
1bff5c0d6a
Merge pull request #823 from WalkerWatch/docupdates/Cleanup
...
Doc flow cleanup.
2016-08-10 09:58:39 -05:00
ed3168a57b
Doc flow cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-08 17:09:57 -04:00
c8036e540f
Updates for Jetty Handlers.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:04:11 -04:00
a5a5098d90
Merge branch 'jetty-9.4.x'
2016-08-02 14:48:37 -05:00
6108b9a234
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-08-02 14:48:14 -05:00
271728ef7d
Jetty and Maven updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-01 17:55:54 -04:00
c16ff0f49f
Merge branch 'jetty-9.4.x'
2016-07-29 16:13:56 -05:00
0ecc8caff6
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-29 16:13:38 -05:00
5edc2a0bb3
Chapter 22 revisions and misc adoc updates.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-29 16:40:25 -04:00
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
5b85eccee4
Merge branch 'jetty-9.4.x'
2016-07-28 12:20:23 -05:00
a2d37ad98d
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-28 12:20:08 -05:00
b45fbbfd04
Merge pull request #781 from WalkerWatch/docupdates/Chapter20
...
Chapter 20 cleanup.
2016-07-28 12:19:21 -05:00
431d2fb016
Chapter 20 cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 13:29:12 -04:00
98005ea9ab
Resolves #761
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-27 07:58:24 -04:00
e93fa6c141
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-27 10:39:37 +10:00
8d380220c4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-27 10:35:37 +10:00
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
de2465d0dd
Merge branch 'jetty-9.4.x'
2016-07-26 07:53:55 -05:00
e9140a30b2
merging 9.3 to 9.4
2016-07-26 07:53:17 -05:00
0adee58367
Merge pull request #769 from WalkerWatch/jetty-9.3.x
...
Fixing doc rendering issue.
2016-07-26 07:51:46 -05:00
043b494c57
Merge pull request #763 from WalkerWatch/docupdates/chapter17
...
Chapter 17 cleanup.
2016-07-26 07:51:38 -05:00
288ebe8d30
Fixing doc rendering issue.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-26 08:48:03 -04:00
42d1647413
Merge branch 'jetty-9.4.x'
2016-07-22 17:32:47 -05:00
f3fe72a708
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-22 17:32:27 -05:00
232ca5b1d8
Resolves #764."
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 18:14:14 -04:00
e368f3d8ee
Chapter 17 cleanup.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-22 14:53:18 -04:00
bfeedc6f5e
Merge branch 'jetty-9.4.x'
2016-07-22 12:09:00 -05:00
85af98b483
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-22 12:08:40 -05:00
e800e616d6
Merge pull request #758 from WalkerWatch/docupdates/chapter16
...
Chapter 16 updates
2016-07-22 12:08:11 -05:00
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
7c9f3ec727
Chapter 16 updates
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 17:19:25 -04:00
127028d4d9
Chapter 15 cleanup
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-21 12:34:30 -04:00
98454b8726
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 17:50:51 +02:00
cf0ecbd88f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 17:50:08 +02:00
fa24eb3541
Resolves #747 .
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 18:14:47 -04:00
7346476c92
Merge branch 'jetty-9.4.x'
2016-07-20 15:18:23 -05:00
4a2d471537
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-20 15:17:57 -05:00
77a8556ffe
Updates images for chapter 14.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 16:11:49 -04:00
92af8eb8fc
Updates for Chapter 14.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-20 16:09:01 -04:00
f068780749
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-20 13:19:15 +02:00
11d0569a75
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-20 13:18:26 +02:00
c09251fbaf
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:17:31 +02:00
af007da091
resolve merge conflict
2016-07-19 14:35:01 -05:00
9071456f8f
resolve merge conflict
2016-07-19 14:32:50 -05:00
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
491be7505b
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-19 10:34:59 +02:00
0d8f1b9e69
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-19 10:34:19 +02:00
554d0ab4c1
Chapter 12 Updates ( #738 )
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-19 08:42:52 +10:00
087fd07007
Chapter 12 Updates
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-18 16:37:37 -04:00
0c1cfb350c
Merge branch 'jetty-9.4.x'
2016-07-15 14:32:56 -05:00
8718f4e1bf
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-15 14:32:30 -05:00
7ba4e9c8d2
Minor edits to RequestLog documentation.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:29:22 -04:00
00b3738536
Updated RequestLog xml/module/documentation. Resolves #734
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:08:30 -04:00
bb7912a9d0
Merge branch 'jetty-9.4.x'
2016-07-14 13:29:51 -05:00
d178f23ec7
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-14 13:29:38 -05:00
37d0caedee
Merge pull request #728 from WalkerWatch/jetty-9.3.x
...
Fixing SRCDIR references.
2016-07-14 11:28:47 -07:00
ff200043de
Fixing SRCDIR references.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-14 14:25:20 -04:00
4455cc7cfb
set to proper location
2016-07-14 13:19:20 -05:00
300641c0e6
Merge branch 'jetty-9.4.x'
2016-07-14 13:18:52 -05:00
73d546ceac
update for proper branch
2016-07-14 13:18:34 -05:00
37015b8536
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-14 13:18:03 -05:00
312028df15
Update pom.xml
2016-07-14 13:17:10 -05:00
WalkerWatch
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jens Reimann
Jesse McConnell
Jan Bartel
WalkerWatch
Joakim Erdfelt
Shauway