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

61 Commits

Author SHA1 Message Date
Greg Wilkins f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Kazuhiro Sera 96218e8bc4 Fix typos detected by github.com/client9/misspell 
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
 2018-08-10 23:52:16 +09:00
David Shepherdson b6bc2bea7a Issue #2762: Fixed typo when checking JETTY_START_TIMEOUT. 
Signed-off-by: David Shepherdson <david@shepherdson.name>
 2018-08-02 21:51:27 +10:00
Joakim Erdfelt 30f6132117 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-07-03 10:55:22 -05:00
Carter Kozak cd60da7a12 fix #2342 Upgrade Conscrypt to 1.1.4 
Fixes https://github.com/google/conscrypt/issues/491

Signed-off-by: Carter Kozak <c4kofony@gmail.com>
 2018-06-29 08:41:34 -04:00
Joakim Erdfelt 1c04f9838d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-22 16:42:42 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Jesse McConnell eca61cd616 Resolves #2152 by adding new artifacts with 'sources' classifier which contains the -sources artifacts for jetty classes under lib (only) 
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
 2018-01-24 08:46:23 -06:00
Zachary Duquette 65fdec0bd7 Configure jetty start timeout using JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-11 12:49:50 +01:00
mhow2 a5db14d0d9 Update jetty.sh (#1890) 
Real for loop. Easy to modify in case it's needed to wait longer for jetty to start (from mhow2)
 2017-12-11 12:44:35 +01:00
WalkerWatch 29fd791213 Merge branch 'jetty-9.4.x' 2017-11-28 17:24:19 -05:00
Simone Bordet 4ca0a63e58 Issue 1830 - Document Conscrypt SSL. (#2001) 
Updated references to Conscrypt 1.0.0.RC11.
Used "default" rather than "native" for the JSSE docs.
Changed "two-way authentication" to "client certificate authentication".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-11-28 17:23:18 -05:00
Greg Wilkins 530e28563c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-20 11:27:55 +11:00
Greg Wilkins be04d47a9d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 11:27:30 +11:00
Greg Wilkins 4dc6791ade Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 11:20:45 +11:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Greg Wilkins 31a9b6f2e8 Issue #215 Conscrypt module for SSL and ALPN 
Squash of the following commits:

commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:27:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:26:45 2017 +1000

    Issue #215 Conscrypt module debug

commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 18:23:51 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed server-side ALPN negotiation for Conscrypt.

commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 16:56:20 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed client-side ALPN negotiation for Conscrypt.

commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 15:26:45 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Code cleanups.

    Changed ALPNProcessor.init(boolean) to init().
    Removed unnecessary try/catches and simplified exception handling.

commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 18:07:30 2017 +1000

    Issue #215 Conscrypt SSL pom cleanups

commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:57:20 2017 +1000

    Issue #215 Conscrypt SSL ALPN cleanups

commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:46:13 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 14:56:06 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 17:19:49 2017 +1000

    Fix #1823 MimeTypes for ResourceHandler mp4

commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:21:39 2017 +1000

    Issue #215

commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:08:05 2017 +1000

    Issue #215

    Use conscrypt 1.0.0.RC10 uber jar

commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 10:35:43 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 16:04:05 2017 +1000

    Issue #215 Conscrypt ALPN provider

    First attempt at client support

commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 09:48:43 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 08:49:10 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 15:24:27 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 11:04:24 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:04:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:03:52 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 21:19:28 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:22:19 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:16:35 2017 +1000

    Issue #215 Conscrypt ALPN provider
 2017-09-21 07:34:25 +10:00
Joakim Erdfelt f107ec8c21 Merge pull request #1712 from gouessej/master 
Add systemd service file #1485
 2017-09-13 06:48:27 -07:00
Zachary Duquette 6613a45677 Added missing space to remove bash warning from JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
 2017-08-18 16:10:02 -04:00
Zachary Duquette ed4d488e93 Configure jetty start timeout using JETTY_START_TIMEOUT 
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
 2017-08-17 15:36:10 -04:00
Joakim Erdfelt 3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07:00
Greg Wilkins cfeb2a3325 Issue #215 Conscrypt SSL provider 
upgraded to 1.0.0.RC9
 2017-08-08 09:15:51 -07:00
Greg Wilkins 1a07ddd787 Issue #215 Conscrypt SSL provider 
Added module to install Conscrupt SSL provider
 2017-08-08 09:15:43 -07:00
Greg Wilkins 652cc327d7 Stop module 
Moved jetty-stop.xml to jetyt-home
Created stop module
 2017-08-08 09:13:26 -07:00
Julien Gouesse 65d7148461 Add systemd service file #1485 
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
 2017-08-05 21:24:46 +02:00
Greg Wilkins 6494c2ce7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-02 12:22:37 +10:00
Greg Wilkins 7298bed572 Issue #215 Conscrypt SSL provider 
Added module to install Conscrupt SSL provider
 2017-08-02 11:52:31 +10:00
Greg Wilkins 7065196400 Issue #1676 remove deprecated properties from XML 2017-07-19 16:29:13 +02:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
Greg Wilkins c6b9ce0401 Stop module 
Moved jetty-stop.xml to jetyt-home
Created stop module
 2017-06-08 12:53:04 +02:00
Greg Wilkins cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02:00
WalkerWatch e091701bcd Reviewing modules for #207 2017-05-09 13:38:14 -04:00
Joakim Erdfelt 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -07:00
Greg Wilkins 5a04af9292 Issue #1226 use $NAME 2017-02-09 16:48:15 +11:00
Simone Bordet 9c975d7c9b Merged branch 'jetty-9.4.x' into 'master'. 2017-01-13 19:06:36 +01:00
Greg Wilkins 07fb9c97db Issue #1260 expand system properties 2017-01-13 17:49:27 +11:00
Simone Bordet a51f800054 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-10 15:07:26 +01:00
Greg Wilkins bf60197490 Fixes #1226 
Moved jetty.sh to jetty-home
relocated JETTY_RUN to be a jetty directory in /var/run etc.
moved start.log to be in JETTY_RUN
 2017-01-10 17:10:27 +11:00
Simone Bordet a62e0968d5 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 20:47:59 +02:00
Simone Bordet c6ac3c8c39 Removed unnecessary files. 2016-10-19 20:46:59 +02:00
Simone Bordet 6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Simone Bordet b2c62b648f Removed reference to jetty-logging.xml. 
File jetty-logging.xml has been renamed to console-capture.xml,
but it's not needed anymore in jetty.conf.
 2016-10-19 16:01:28 +02:00
Simone Bordet 582de49311 Improved error message for modules that are no longer available. 2016-10-19 15:56:28 +02:00
Simone Bordet ae240b9c17 Fixed properties in *.mod and *.xml for module console-capture. 2016-10-19 11:44:13 +02:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Greg Wilkins 68e86e4d4e Deprecated Modules #1003 
Added deprecated.properties file to provide more details of deprecated modules
 2016-10-14 10:48:51 +11:00
Jan Bartel 6a2316fb23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:21:51 +11:00
Greg Wilkins 9d475a624b Normalize tags #998 2016-10-13 10:06:17 +11:00
Jesse McConnell 08dc20476b fix jolokia on merge from 9.4.x 2016-10-12 09:48:02 -05:00