Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,002 Commits 75 Branches 465 Tags 368 MiB
Commit Graph

225 Commits

Author SHA1 Message Date
Greg Wilkins 7310067954 updated global binding test 2016-10-06 12:58:15 +11:00
Joakim Erdfelt 76422ba76c Merge branch 'jetty-9.4.x' 2016-09-27 14:23:59 -07:00
Joakim Erdfelt 300a7ca220 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-27 14:23:44 -07:00
Joakim Erdfelt e82592fe9c Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-27 14:23:30 -07:00
Joakim Erdfelt fc447fe2a3 Minor typo fix 2016-09-27 14:23:24 -07:00
Joakim Erdfelt ed8310dbff Merge branch 'jetty-9.4.x' 2016-06-28 13:48:12 -07:00
Joakim Erdfelt ac90d2b562 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-28 13:47:54 -07:00
Joakim Erdfelt bba1c19875 Fixes #668 - Introduce optional `jetty.deploy.defaultsDescriptorPath` for jetty-deploy defaults descriptor outside of ${jetty.home} 2016-06-28 13:44:36 -07:00
Joakim Erdfelt 1ac1673396 Fixes #667 - Alternate `jetty.deploy.monitoredDirPath` for jetty-deploy outside of ${jetty.base} 2016-06-28 13:39:28 -07:00
Greg Wilkins a5ad291add Squashed commit of the following: (#528) 
commit 4bf6b7c951
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c0
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e9
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf62
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b5687329
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c4
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055de
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe5
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f83
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acd
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

    Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature

commit 89803aec95
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0b
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770a
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3a
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de4
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-05-02 17:55:54 +10:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Greg Wilkins fa374cd899 485884 - WebAppContext defaults should be same for xml or war deployment 2016-01-15 13:44:38 +11:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Greg Wilkins 20072252c0 Set jetty home/base for GlobalWebappConfigBinding 2015-10-21 16:56:58 +11:00
Greg Wilkins 02c5ea30be 477123 - AsyncListener callbacks need context scope 
Also added DebugListener and deprecated DebugHandler
 2015-09-11 12:06:23 +10:00
Joakim Erdfelt e24cc3ee5e Merge branch 'jetty-9.2.x' 2015-07-23 12:45:25 -07:00
Joakim Erdfelt 3f85fbbbd2 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:44:43 -07:00
Joakim Erdfelt 38d4f2cc2d Updating license header date 2015-07-23 12:22:48 -07:00
Joakim Erdfelt b954a2dad5 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:16:50 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 6ecfb96508 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 17:18:05 -07:00
Joakim Erdfelt 18a1096412 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 16:31:01 -07:00
Simone Bordet fd158a231b 460671 - Rationalize property names. 
Fixed typos.
 2015-04-14 22:11:59 +02:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names. 
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
 2015-04-13 16:21:48 +02:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Joakim Erdfelt 4b6d024c85 Using webdefault.xml from jetty-distribution in test cases 2015-02-18 12:39:06 -07:00
Simone Bordet be860741d5 459655 - Remove SPDY and NPN. 
Cleanup of javadocs, comments, XML and other text files.
 2015-02-11 16:18:07 +01:00
Jan Bartel 0aa6f1b706 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 16:08:41 +01:00
Jan Bartel b195e7ee20 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 13:23:37 +01:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Simone Bordet 04e948bf3c 450483 - Missing parameterization of etc/jetty-deploy.xml. 2014-11-07 11:56:58 +01:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Jan Bartel 2ba7334868 Fix comment in webdefault.xml to show mime.properties is in jetty-http.jar 2014-05-12 11:44:41 +02:00
Joakim Erdfelt e1540be4cf 428817 - jetty-start / Allow for property to configure deploy manager `webapps` directory 
+ Adding 'jetty.deploy.monitoredDirName' property
 2014-03-21 11:54:41 -07:00
Jan Bartel 78ce25fa06 Fix incorrect pattern for ContainerIncludeJarPattern. 2014-03-19 13:24:04 +11:00
Greg Wilkins 119718d86f added jetty-quickstart module 2014-03-19 09:56:19 +11:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Jan Bartel c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
 2013-09-10 10:18:12 +10:00
Thomas Becker 598fa8acf7 415401 WebAppProvider: override XmlConfiguration.initializeDefaults 2013-09-09 10:05:37 +02:00
Thomas Becker 5d21e4246b 415401 WebAppProvider: override XmlConfiguration.initializeDefaults 2013-09-09 09:49:08 +02:00