WalkerWatch
73bc58ca78
Issue #788 - Test Cases with output check.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:54:18 -04:00
WalkerWatch
23733b1348
Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into issues/788
2016-08-05 14:47:39 -04:00
Joakim Erdfelt
1b3b57b2d3
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2016-08-05 11:44:17 -07:00
Joakim Erdfelt
b4189a54c7
Fixes #819 - Adding output assertions logic to TestUseCases
2016-08-05 11:43:53 -07:00
WalkerWatch
11131acae9
Issue #788 - Adds warning for previously enabled modules.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 12:28:13 -04:00
WalkerWatch
be54198b72
Resolves #802
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-02 12:48:50 -04:00
Joakim Erdfelt
68f684eb3c
Fixing jetty-start test usecases
2016-07-26 12:57:30 -07: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
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07: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
Simone Bordet
0d74c3ec2c
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:05:43 +02:00
Greg Wilkins
77d8ebf1cd
Removed --add #627
2016-07-20 14:59:45 +10:00
Joakim Erdfelt
35de3899b6
Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references
2016-07-12 17:49:11 -07:00
Greg Wilkins
5c7b0247e7
Issue #627 Use start.d or start.ini not both
...
Added --create-startd option
Improved tests
2016-06-23 12:01:07 +10: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
d79b0a7acd
Issue #644 Modules for enabling logging
...
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Greg Wilkins
2fbf466393
Issue #644 Modules for enabling logging
2016-06-17 07:39:11 +10:00
Greg Wilkins
443e99c3fb
Issue #515 Alternate start modules
...
Fixed ordering unit tests
made depends work for provided modules
2016-06-16 13:44:42 +10:00
Greg Wilkins
79874d80ff
Fix #627 Use start.d or start.ini not both
...
create file in empty to ensure it is not pruned
2016-06-10 09:40:26 +10:00
Greg Wilkins
6c21f0d30d
Fix #627 Use start.d or start.ini not both
...
Updated usage text
2016-06-09 16:51:26 +10:00
Greg Wilkins
383e81db38
Fix #627 Use start.d or start.ini not both
...
Updated start module to look for start.d and use it if it exists
Error or warning of both start.d and start.ini exist
updated jetty-distribution to use one or the other
2016-06-09 16:45:24 +10:00
Greg Wilkins
918399b69f
fixed module ordering problem
2016-06-08 18:27:28 +10:00
Simone Bordet
73fe6715de
Issue #306 - Merge jetty-parent into jetty-project.
...
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Greg Wilkins
3e8187dcd5
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-04-29 16:58:00 +10:00
Greg Wilkins
879afebfba
Issue #515 Alternate start modules
...
Correctly remove tranient properties when replace by explicit alternative
2016-04-28 18:10:59 +10:00
Greg Wilkins
d54ba38cb6
Issue #515 Alternate start modules
...
Additional usecases to test for loops in dynamic modules
2016-04-28 17:46:52 +10:00
Jan Bartel
9800c3c128
Issue #525
...
Removed deprecated "name"
2016-04-28 17:38:05 +10:00
Jan Bartel
f63bdda05c
Issue #532 Get rid of generated jetty-start/dependency-reduced-pom.xml
2016-04-28 17:11:46 +10:00
Greg Wilkins
a377b3a8f3
Issue #529
...
Support zero padded version updates
2016-04-28 14:30:20 +10:00
Greg Wilkins
728e0a7d57
Issue #515 Alternate start modules
...
Deprecated warning if [Name] used
2016-04-28 11:40:10 +10:00
Joakim Erdfelt
301fc12d98
Merge branch 'jetty-9.3.x'
2016-04-25 12:11:38 -07:00
Joakim Erdfelt
66a70adb98
Merge branch 'release-9.2.16' into jetty-9.2.x
2016-04-25 11:34:07 -07:00
Simone Bordet
64a8d8819f
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-20 14:29:38 +02:00
Simone Bordet
89efdb3e09
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-04-20 14:29:11 +02:00
Simone Bordet
c90f60bd9c
Updated ALPN version for JDK 8u91 and 8u92.
2016-04-20 14:26:17 +02:00
Greg Wilkins
ab97a78407
Issue #515 Alternate start modules
...
Added another usecase
2016-04-20 16:37:42 +10:00
Greg Wilkins
e846379c2c
Issue #515 Alternate start modules
...
Added another test case.
Handle (poorly) the case where a default transitive module adds ini properties
and is then replaced by a non transitive module.
2016-04-18 09:28:19 +10:00
Greg Wilkins
62563beee7
Issue #515 Alternate start modules
...
Added more test usecases
2016-04-17 23:16:33 +10:00
Greg Wilkins
6829bec09e
Issue #515 Alternate start modules
...
Javadoc
2016-04-16 23:23:09 +10:00
Greg Wilkins
0f6933fca1
Issue #515 Alternate start modules
...
Allow enable when provided capability from transient
sort usecases
2016-04-16 23:04:14 +10:00
Greg Wilkins
bbc84a3d01
Issue #515 Alternate start modules
...
Replaced the module Name mechanism with a Provides mechanism for #515 . This keeps a modules
name immutable, which makes it easier to find.
Simplified the unit tests by removing all the use-casees with real names (can be confusing and does
not age well). Deleted more specific unit tests in favour of a more capable generic usecase test
mechanism. Have added multiple tests per base; exceptional results. Still need to add in
support for running --add-to-start type commands prior to execution and then to add many more
usecases
2016-04-16 11:01:08 +10:00
Joakim Erdfelt
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
Joakim Erdfelt
2c4cdbe259
Merge branch 'jetty-9.3.x'
2016-04-13 11:52:53 -07:00
Joakim Erdfelt
6abb272619
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-13 11:52:36 -07:00
Joakim Erdfelt
210f9a8d7c
Fixes #510 - Module [depend] property expansion should support eg foo/${bar}/${bar}-xxx
2016-04-13 11:50:57 -07:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Simone Bordet
2cd8d55d26
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-05 11:01:17 +02:00
Simone Bordet
b047c6332e
Fixed ALPN files merge.
2016-04-05 11:00:47 +02:00
Greg Wilkins
8f74ff3585
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-04-05 10:01:22 +10:00
Greg Wilkins
424f0c1e04
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-04-05 09:57:28 +10:00
Simone Bordet
5aef3ba3e4
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-04 15:41:04 +02:00
Simone Bordet
c1997b40a5
Updated ALPN to OpenJDK 8u77.
2016-04-04 15:38:53 +02:00
Simone Bordet
3e6bc4d17a
Updated ALPN version for JDK 8u77.
2016-04-04 10:58:09 +02:00
Joakim Erdfelt
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
Jesse McConnell
c74b0c23e9
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 08:11:27 -07:00
Jesse McConnell
b08f177d47
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 08:09:12 -07:00
Jesse McConnell
d8f74233a0
fix some merge issues, some example javadoc that was never right and contributing language
2016-02-26 08:13:41 -06:00
Jesse McConnell
ce5a3b11d6
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 08:03:33 -06:00
Jesse McConnell
76b34fe79a
Issue #367 Resolve remaining git.eclipse.org build references
2016-02-26 07:51:05 -06:00
Joakim Erdfelt
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
Joakim Erdfelt
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
Simone Bordet
2ac465a343
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-09 18:14:07 +01:00
Simone Bordet
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
Simone Bordet
145e4bee71
487511 - Jetty HTTP won't work on turkish systems.
...
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
2016-02-09 17:50:26 +01:00
Simone Bordet
281313440b
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-08 15:57:40 +01:00
Simone Bordet
1ed327ecce
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-08 15:56:53 +01:00
Simone Bordet
e853632c22
Updated ALPN version for JDK 8u73 and 8u74.
2016-02-08 15:52:03 +01:00
Simone Bordet
56c0bc768c
Merged branch 'jetty9.3.x' into 'master'.
2016-01-21 17:52:37 +01:00
Simone Bordet
7703784cab
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-21 17:32:14 +01:00
Simone Bordet
35bc923f50
Updated ALPN version for JDK 8u71 and 8u72.
2016-01-21 17:25:48 +01:00
Joakim Erdfelt
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
Joakim Erdfelt
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07: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
a94e6bf0c0
481903 Module Descriptions
2015-11-11 17:18:20 +11:00
Joakim Erdfelt
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
Simone Bordet
700975fe41
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-05 12:17:30 +01:00
Simone Bordet
50e565bac0
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-11-05 12:14:28 +01:00
Simone Bordet
b4cf2921c8
Updated ALPN version for JDK 8u65 and 8u66.
2015-11-05 12:05:08 +01:00
Greg Wilkins
0b98996745
fixed cherry pick
2015-10-15 16:27:57 +11:00
Greg Wilkins
d5dab98546
start.jar uses shaded jetty-util classes
2015-10-15 15:42:28 +11:00
Greg Wilkins
b9dbf7111d
Use TopologicalSort for start.jar
2015-10-15 15:42:28 +11:00
Greg Wilkins
9866b31420
479712 Documented --approve-all-licenses
2015-10-15 09:47:03 +11:00
Greg Wilkins
d7121881b3
479712 Documented --approve-all-licenses
2015-10-15 09:46:23 +11:00
Greg Wilkins
7c509b4d8c
Revert "479712 Added --yes to start.jar"
...
This reverts commit 4560dabfc2
.
2015-10-15 09:40:53 +11:00
Greg Wilkins
6e203c1ffa
Revert "479712 Added --yes to start.jar"
...
This reverts commit 14b638f8f7
.
2015-10-15 09:39:37 +11:00
Greg Wilkins
14b638f8f7
479712 Added --yes to start.jar
2015-10-14 18:26:14 +11:00
Greg Wilkins
4560dabfc2
479712 Added --yes to start.jar
2015-10-14 18:24:58 +11:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Greg Wilkins
3e242bef16
478280 property file in temp directory
2015-09-25 09:00:46 +10:00
Simone Bordet
da3699dc55
Merged branch 'jetty-9.2.x' into 'master'.
2015-09-21 16:32:58 +02:00
Simone Bordet
77fdfb8754
Updated ALPN version for JDK 8u60.
2015-09-21 16:19:48 +02:00
Jesse McConnell
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
Jesse McConnell
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
Greg Wilkins
aca2aa56ad
475483 - Starting Jetty with [exec] should use properties file.
...
Added --exec-properties to allow the name of the properties file to be set
and for it not to be deleted on exit.
2015-08-21 09:03:26 +10:00
Simone Bordet
837a36e3ec
475483 - Starting Jetty with [exec] should use properties file.
...
Now using a properties file in case of [exec], and moved the
properties file inside the $jetty.base directory.
2015-08-20 15:04:04 +02:00
Joakim Erdfelt
d02a5c3c8b
474361 - Handle JVM version extensions like -internal
...
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
to allow both normal System property access and arbitrary property
setting on command line to work in a consistent fashion.
2015-08-05 17:08:40 -07:00
Joakim Erdfelt
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
Simone Bordet
aa75bcf078
Updated ALPN versions for JDK 8u51.
2015-07-28 16:23:08 +02:00
Simone Bordet
dea406d2b3
Updated ALPN versions for JDK 8u51.
2015-07-27 11:04:27 +02:00
Jesse McConnell
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
Jesse McConnell
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
Jesse McConnell
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
Jesse McConnell
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
Greg Wilkins
9d8d56b401
Remove unused start property defaults
2015-06-19 15:38:43 +10:00
Greg Wilkins
8e635001de
Use precompiled patterns
2015-06-19 15:36:57 +10:00
Greg Wilkins
13b63c194b
Default values for properties in ini files
...
While this feature is not strictly needed, the patch contains some good code cleanups. So it will be applied and then the default feature
removed in a subsequent commit.
2015-06-19 15:27:47 +10:00
Jesse McConnell
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
Jesse McConnell
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
Joakim Erdfelt
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
Joakim Erdfelt
6b54c5a726
Merge branch 'release-9.3'
2015-06-15 10:06:30 -07:00
Joakim Erdfelt
d6665f274c
Using static ref
2015-06-12 10:33:05 -07:00
Joakim Erdfelt
372c0c566f
Merge branch 'master' into release-9.3
2015-06-12 10:00:23 -07:00
Simone Bordet
d557d3cab0
Removed JDK 7 references.
2015-06-12 18:46:44 +02:00
Joakim Erdfelt
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
Joakim Erdfelt
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
Joakim Erdfelt
7711789852
Updating start.jar & tests with new [version] behavior
2015-06-12 09:22:04 -07:00
Joakim Erdfelt
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
Joakim Erdfelt
ae3e9ac79a
469982 - Produce warning for dynamic modules with ini-templates seen during --add-to-start
...
+ Chaning Module.isVirtual() to Module.isDynamic()
+ Adding javadoc for Module.isDynamic()
+ Adding warning for builders on start.ini and start.d/*.ini with
dynamic modules with [ini-template] sections
2015-06-11 12:03:31 -07:00
Joakim Erdfelt
c78f9e2b7c
Cleaning up unused testing bits
2015-06-11 07:01:05 -07:00
Joakim Erdfelt
2672430b6b
469860 - Add module metadata versioning to support backwards compat
...
+ Tweaking defaults/ini section naming per discussion yesterday.
2015-06-11 06:54:25 -07:00
Joakim Erdfelt
5d01c7f2f2
Using correct section
2015-06-10 16:20:07 -07:00
Joakim Erdfelt
ac7e4e925c
469799 - Transitive module dependencies without ini templates are still added to ini
...
+ Fixing --add-to-start(d)=<>
2015-06-10 14:05:05 -07:00
Joakim Erdfelt
d439113712
Making jetty.version discoverable via properties file on classpath too (for test cases)
2015-06-10 13:35:39 -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
Joakim Erdfelt
8bbbb2ff54
469860 - Add module metadata versioning to support backwards compat
...
+ Added [version] section support to start.jar
+ Updated start testing to use as-is distro configuration for test cases
2015-06-10 10:42:40 -07:00
Joakim Erdfelt
73147d2c8e
Revert "469341 jetty-startw template properties during --module enabling"
...
This reverts commit 6c2780b9cf
.
2015-06-09 16:14:32 -07:00
Greg Wilkins
6c2780b9cf
469341 jetty-startw template properties during --module enabling
2015-06-04 13:43:14 +10:00
Jesse McConnell
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
Jesse McConnell
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Simone Bordet
6cabf8452e
468347 - Fix modules/debuglog.mod.
2015-05-26 18:22:22 +02:00
Simone Bordet
3323a4e88d
Updated property names: sslConfig -> sslContext.
2015-05-26 18:03:55 +02:00
Joakim Erdfelt
2b53c98112
467165 - Add --skip-file-validation to start.jar --help output
...
+ Added to usage.txt
2015-05-14 15:28:26 -07:00
Joakim Erdfelt
d09aa16142
Removing unused text
2015-05-14 15:28:23 -07:00
Greg Wilkins
a423416f6f
pretty print dry-run only in debug mode
2015-05-14 14:01:25 +10:00
Joakim Erdfelt
e91d3dd18e
466647 - Add ${jetty.tag.version} property and expand URL properties
...
+ Add missing Props.expand(String) for:
* the --add-to-start(d) options
* the Module.hasFiles() method
2015-05-06 19:09:30 -07:00
Joakim Erdfelt
151df819af
466647 - Add ${jetty.tag.version} property and expand URL properties
...
+ Adding ${jetty.tag.version}
* If Implementation-Version is defined, then it will use it
* If Implementation-Version contains "-SNAPSHOT" then "master" is used
* If no Implementation-Version found, then it uses "master"
2015-05-06 16:23:47 -07:00
Joakim Erdfelt
3a0a85ebc9
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-05-01 09:43:20 -07:00
Greg Wilkins
2271464406
430951 Support SNI with ExtendedSslContextFactory
...
Made modules do automatic selection of Extended SSL Context if running java 8
2015-05-01 15:50:06 +10:00
Joakim Erdfelt
194b1d349a
Fixing build on OSX
2015-04-30 19:15:17 -07:00
Joakim Erdfelt
2fce87ee2f
Fixing test path assumptions on OSX
2015-04-30 17:20:01 -07:00
Joakim Erdfelt
2a86d49ab4
465867 - Implement --skip-file-validation=<module>
...
+ Adding --skip-file-validation=<module> support
2015-04-30 12:08:45 -07:00
Greg Wilkins
fb958833de
464419 Removed xinetd support
2015-04-30 16:44:23 +10:00
Joakim Erdfelt
f7adc1aa5f
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 18:37:55 -07:00
Philippe Marschall
fb58ca79c0
Bug 464442 - Enable parallel class loading
...
Change-Id: If23cc99214efe8d3a75d0ab0d337020524b6709f
Signed-off-by: Philippe Marschall <philippe.marschall@netcetera.ch>
2015-04-22 02:28:37 -04:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet
b26552cbb5
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-15 19:21:11 +02:00
Simone Bordet
6fa863d6be
Updated ALPN and NPN versions for JDK 7u79, 7u80 and 8u45.
2015-04-15 19:09:46 +02:00
Simone Bordet
fd158a231b
460671 - Rationalize property names.
...
Fixed typos.
2015-04-14 22:11:59 +02:00
Simone Bordet
f4a6b4b5eb
460671 - Rationalize property names.
...
Made requestlog use a similar configuration to logging and debugmod modules.
2015-04-14 22:11:59 +02:00
Joakim Erdfelt
76080faaf0
464633 - Change Selection.how to Selection.criteria
2015-04-14 12:05:05 -07:00
Joakim Erdfelt
d9ffed0a07
451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
...
+ In case of ambiguous selection, defaults to start.ini, with warning
message
2015-04-14 12:05:05 -07:00
Joakim Erdfelt
05784f46b4
464555 - ALPN module download attempts to download jar before dir exists
...
+ Ensure directory exists for output before download is attempted.
2015-04-13 17:37:24 -07:00
Joakim Erdfelt
0e2b1856b5
464556 - Restrict start module downloads to ${jetty.base} paths only
...
+ Restrict [files] section references (download/uri/maven) to
output only in ${jetty.base} tree
2015-04-13 17:37:24 -07:00
Joakim Erdfelt
cea577bd17
463144 - modules do not see pre-downloaded ALPN libs
...
+ Test all BaseHome configured locations for download file existence.
2015-04-13 17:37:24 -07:00
Simone Bordet
b7c7211cf5
464537 - Updated setuid dependency to 1.0.3.
...
Also moved here jetty-setuid.xml from the setuid project, so that it
can remain in sync with its correspondent setuid.mod file.
2015-04-13 22:13:02 +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
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Greg Wilkins
1d99c0af7b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-25 14:00:23 +11:00
Greg Wilkins
8c652fd5bd
462546 - ShutdownMonitor should bind to jetty.host
...
Added STOP.HOST system property. jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
Simone Bordet
d20c7707b7
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-24 20:56:26 +01:00
Simone Bordet
3b31d6aa12
Added ALPN files for JDK 8u40.
2015-03-24 12:52:16 +01:00
Joakim Erdfelt
6e952d4618
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00
Joakim Erdfelt
4a41317501
459273 - Redundant license notices
...
+ Adding missing .hasFiles() check in download path.
2015-03-13 13:35:04 -07:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Joakim Erdfelt
a32c9ed79c
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
2015-02-23 18:05:19 -07:00
Joakim Erdfelt
2141cc2dc3
459273 - Redundant license notices
...
+ Only showing license acknowledgement request screen
if [FILES] section contains content that does not (yet) exist
2015-02-23 16:49:07 -07:00
Joakim Erdfelt
7bb3127ee1
Making jetty-start test cases more aligned with real distro configuration
2015-02-19 16:23:40 -07:00
Joakim Erdfelt
4b6d024c85
Using webdefault.xml from jetty-distribution in test cases
2015-02-18 12:39:06 -07:00
Joakim Erdfelt
2c9edae231
459681 Remove Glassfish JSP in favor of Apache JSP
...
+ Fixed names in apache-jsp and apache-jstl modules
+ Updated jetty-start tests to better represent new distribution
structure.
2015-02-18 11:46:58 -07:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Joakim Erdfelt
f7b9206b2e
Eliminating final protonego references
2015-02-12 10:14:01 -07:00
Joakim Erdfelt
cab76950e1
459655 - Remove SPDY and NPN
...
+ Removed src/test/resources/usecases/home
+ Updated src/test/resources/dist-home to represent current distribution
configuration for Jetty 9.3.0 without SPDY or NPN
+ Changed all test cases to use new dist-home
+ Refactored TestUseCases and TestBaseUseCases for @Parameterized and
consistent naming in src/test/resources/usecases/
2015-02-11 10:05:51 -07:00
Simone Bordet
b073e4f52c
Fixed URIs in NPN and ALPN *.mod files.
2015-01-30 16:18:10 +01:00
Simone Bordet
1ccd0d0dba
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-30 12:08:27 +01:00
Simone Bordet
4c751e10e1
Updated ALPN and NPN versions.
...
NPN to version 1.1.10.v20150130 for OpenJDK 7u75 and 7u76.
ALPN to version 7.1.3.v20150130 for OpenJDK 7u75 and 7u76,
and to version 8.1.3.v20150130 for OpenJDK 8u31.
2015-01-30 11:55:28 +01:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Simone Bordet
3fddabbba0
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod files.
2014-12-02 17:49:31 +01:00
Simone Bordet
12b25b786e
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod
...
files.
2014-12-02 17:42:51 +01:00
Joakim Erdfelt
1d12decce7
changing .getEnabled() to .getSelected()
2014-11-20 16:25:00 -07:00
Joakim Erdfelt
9ea0b74f73
Tweaking output of selected modules tree in --list-modules to be more clear
2014-11-20 16:25:00 -07:00
Joakim Erdfelt
69daa8d76d
Cleanup of no longer needed code.
...
+ Removing Modules.normalizeDependencies()
+ Using Modules.resolveNode() instead
+ Chaning Modules.resolveNode() to not throw Exception
2014-11-20 09:53:02 -07:00
Joakim Erdfelt
df9414eab2
Making test failure message more meaningful (including full stacktrace)
2014-11-20 09:52:33 -07:00
Joakim Erdfelt
2020e07243
Removing test noise
2014-11-20 09:52:10 -07:00
Joakim Erdfelt
1604cffc0b
Fixing HowUniquePredicate
2014-11-20 08:48:35 -07:00
Joakim Erdfelt
9bd0ce1938
452503 - Start.jar --add-to-start=jstl results in GraphException: Unable to expand property in name: jsp-impl/${jsp-impl}-jstl
...
+ Preserving [depend] declaration order by switching from Set to List
+ Switching from BFS based selection / resolve logic in node selection
to DFS based, to allow parent nodes to resolve completely before
attempting other parent nodes.
2014-11-20 08:32:55 -07:00
Joakim Erdfelt
466fce4b80
452329 - Transitive modules in start.jar --add-to-start(d) are not added if enabled already in tree
...
+ Modules can now be re-added.
based on the node.selection.how == name
and all other node selections must
be node.selection.explicit == false
2014-11-19 17:32:12 -07:00
Joakim Erdfelt
9d3852cb98
Fixing build
2014-11-19 17:00:48 -07:00
Joakim Erdfelt
7b5b81e76f
Ignoring failing test
2014-11-19 17:00:27 -07:00
Joakim Erdfelt
d786c4a57e
452322 - Restore progress messages for --add-to-start(d) use
2014-11-19 16:57:52 -07:00
Joakim Erdfelt
89baf907b6
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Eliminating lots of now dead code (#uncoding)
+ Making ambiguous add detection more sane.
2014-11-19 16:42:55 -07:00
Joakim Erdfelt
005b513653
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Refactoring out the Graph + Node logic into its own package
+ Changing Matcher to Predicate
+ Introducing new Node.selection Set which tracks how the various nodes
are selected, along with with ability to track directly selected (aka
explicit) vs transitive.
+ Module now extends from Node
+ Modules now extends from Graph<Module>
2014-11-19 15:59:54 -07:00
Joakim Erdfelt
1561de0f81
Cleaning up resolveEnabled() deprecation
2014-11-19 10:27:25 -07:00
Joakim Erdfelt
88900593de
Fixing 2 typos
2014-11-17 13:56:55 -07:00
Joakim Erdfelt
dbf6f2e644
451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
...
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
- StartDirBuilder
- StartIniBuilder
+ The buildout of the directories from the [files] section is now
maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
2014-11-17 13:21:01 -07:00
Joakim Erdfelt
61e480c2c1
451974 - Combine multiple start license acknowledgement into one
...
+ Initial work to combine licensing into a single event
Depends on work from bug #451973
2014-11-17 13:20:12 -07:00
Joakim Erdfelt
453ab6d5c7
Supporting optional use of maven local repository for download content
2014-11-14 12:15:07 -07:00
Joakim Erdfelt
ccaddc5d43
Working on utility to update maven refs
2014-11-14 09:53:18 -07:00
Joakim Erdfelt
15bf5b02f8
Updating Main.initFiles() to be extensible
2014-11-13 14:23:26 -07:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Greg Wilkins
50b6391be1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-11-05 10:36:57 +11:00
Joakim Erdfelt
04fc803b0e
448446 - org.eclipse.jetty.start.Main create classloader duplicate
...
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
Joakim Erdfelt
1d88eab518
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
Joakim Erdfelt
214246061e
449291 - --create-files downloads without license
...
+ Adding dist-home replicationa real distribution
Adding RebuildTestResources.java to help rebuild this dist-home
occasionally. There is no need to keep this directory up to date
as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
Joakim Erdfelt
153dd4023e
Removing support for module [ini-template] use of --module=<name>
...
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
2014-11-03 09:19:05 -07:00
Joakim Erdfelt
83e3a29fbd
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-11-03 09:19:05 -07:00
Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Joakim Erdfelt
43b3cd9f46
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-10-30 15:05:24 -07:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Greg Wilkins
a6e00bc642
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Joakim Erdfelt
7cbd3c0488
440925 - NPE when using relative paths for --start-log-file
2014-10-29 16:25:55 -07:00
Joakim Erdfelt
8899f6d360
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt
733cc71791
Reworking jetty.home warning to be a module instead.
...
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt
7c40c0e2be
Removing 2 second sleep
2014-10-29 14:33:46 -07:00
Joakim Erdfelt
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Joakim Erdfelt
af5f9382a4
449001 - Remove start.d directory from JETTY_HOME
...
+ Reworking warning to be optional but still start Jetty also.
+ Leaving start.d out of {jetty.home} still.
2014-10-28 10:28:17 -07:00
Joakim Erdfelt
f4f600ff05
Code cleanup (post-merge)
2014-10-28 09:45:25 -07:00
Joakim Erdfelt
607a560ebd
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-28 09:36:34 -07:00
Joakim Erdfelt
653cb32ede
Adjusting start/run warning messages on missing file content.
...
+ Leaving behavior of missing directories alone.
+ See bug #427204 for old behavior bug
2014-10-28 09:35:11 -07:00
Joakim Erdfelt
9dd0db8eeb
449001 - Remove start.d directory from JETTY_HOME
...
+ Removed start.d from {jetty.home}
+ Removed most of start.ini content as well
+ DID NOT remove or alter start.d functionality from start.jar
+ DID NOT remove or alter demo-base/start.d/ example
+ Made running jetty from {jetty.home} simply show a warning message
+ DID NOT remove ability to run jetty from {jetty.home}
Just made it a manual process requiring intention on behalf of the
user
2014-10-28 09:04:25 -07:00
Simone Bordet
7cdcd69f44
Reverted version to 9.2.4-SNAPSHOT.
2014-10-28 11:52:00 +01:00
Jesse McConnell
3b745f06df
[maven-release-plugin] prepare for next development iteration
2014-10-27 16:16:24 -05:00
Jesse McConnell
4f0d78c91b
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
2014-10-27 16:16:18 -05:00
Joakim Erdfelt
6ff43a0af1
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-27 13:42:30 -07:00
Simone Bordet
6268421dd0
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-16 18:05:12 +02:00
Simone Bordet
6f42d21ed5
446063 - ALPN Fail SSL Handshake if no supported Application Protocols.
2014-10-16 15:31:24 +02:00
Simone Bordet
890d7a8d1f
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-13 22:01:20 +02:00
Simone Bordet
9796457dfc
446672 - NPN Specification issue in the case no protocols are selected.
2014-10-13 21:27:11 +02:00
Greg Wilkins
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt
67db9e67de
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-09 12:42:14 -07:00
Joakim Erdfelt
2f696e87bd
445258 - STOP.WAIT is not really respected
...
Fixing stupid typo / copy / paste bug
2014-10-08 15:01:05 -07:00
Joakim Erdfelt
bf7637a2df
Reworking cdi-webapp-it to also use new cdi module
2014-09-26 17:16:35 -07:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Greg Wilkins
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
Greg Wilkins
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
Greg Wilkins
b02cdc10c1
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-22 16:11:47 +10:00