Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,134 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

764 Commits

Author SHA1 Message Date
Joakim Erdfelt 363d5f2df3 Updating to version 9.4.24.v20191120 2019-11-20 15:25:01 -06:00
Joakim Erdfelt 453d41940b Updating to version 9.4.24-SNAPSHOT 2019-11-18 13:52:51 -06:00
Joakim Erdfelt abbccc65d6 Updating to version 9.4.23.v20191118 2019-11-18 13:09:44 -06:00
Jan Bartel 3b891ba137 Issue #1743 Fix merge of PR4242 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-18 10:34:39 +11:00
Jan Bartel f2c0d86de5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 2019-11-18 10:05:50 +11:00
Jan Bartel 4523c8e7fa Issue #1743 Checkstyle warning 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-18 09:35:29 +11:00
Greg Wilkins 46a3368f3b
Issue #2578 - Listener behavior cleanup (Jetty 10.0.x) (#3966) 
* Avoid creating listener list for rarely used requestAttributeListener

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

Keep a list of EventListeners in the AbstractConnector to make it
more efficient to add and iterate over them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Use addEventListener rather than bespoke listener methods.
Support getEventListenerBeans at Container level for fast lookup
improve javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed test
more javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

Don't use null for empty lists of listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fix merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Resolve differences between eventListeners added as beans and beans
added as EventListeners.   The behaviour should now be the same
regardless of how they listener is added and all listeners are now
beans.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Add only SelectorManager listeners to manager from connector

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

Fixed javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

removed old TODO

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

connector cannot be null

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964

AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

fixed merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fixed javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #2578 EventListener

removed the ability to set/clear context listeners
Instead just remove non-durable ones.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Simplified listener handling by avoiding null connector, previously
only needed for testing.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fixed bad merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Fixed test that assumed HttpChannel listeners were not cleared by a recycle

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3964 Listeners

Separated out durable vs cyclic HttpChannel.Listeners, so as to
simplify handling.

Deprecated cyclic HttpChannel.Listeners, as I'm not sure the channel is
the right place for them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* removed deprecated cyclic HttpChannel listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* removed deprecated cyclic HttpChannel listeners - import

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4003 Cleanup quickstart

* Fixed tests that scan for "Started" on console

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-11-13 11:04:38 +11:00
Simone Bordet b1d231b9e7 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-11 16:45:12 +01:00
Jan Bartel 04bc4c786e Issue #1743 Rename JettyWebAppContext to MavenWebAppContext 
Checkstyle fixes

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-11 17:21:04 +11:00
Jan Bartel c50cc856a8 Issue #1743 Remove dup call of configureUnassembledWebApp 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-11 16:44:12 +11:00
Jan Bartel 084345fb9a Issue #1743 Update doco. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-11 15:46:42 +11:00
Lachlan c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 (#4292) 
make headerCacheSize on HttpReceiverOverHTTP configurable

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-11-08 21:57:49 +11:00
Jan Bartel 79c2b819c7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-06 16:49:35 +11:00
Jan Bartel f55fbdb7eb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-11-06 16:09:02 +11:00
Jan Bartel aefbdfca58
Issue #2266 Rework Scanner and use it for Jetty Maven Plugin (#4239) 
* Issue #2266 Rework Scanner and use it for Jetty Maven Plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-06 15:55:20 +11:00
Jan Bartel 9f0cb2e30b Issue #1743 Refactor to avoid always calling configureUnassembledWebApp 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-06 15:40:03 +11:00
Jan Bartel 335f07f71e Issue #1743 Refactor to make unassembled webapp params clearer. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-06 12:23:00 +11:00
Jan Bartel ee7f860a2e Issue #1743 Field and method names; remove scanTargets 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-11-06 11:30:47 +11:00
Joakim Erdfelt 43d95cd984 Updating to version 9.3.29-SNAPSHOT 2019-11-05 13:02:10 -06:00
Joakim Erdfelt d7dd68d6e9 Updating to version 9.3.28.v20191105 2019-11-05 11:46:40 -06:00
Joakim Erdfelt b17439c731 Updating to version 9.2.30-SNAPSHOT 2019-11-05 11:23:21 -06:00
Joakim Erdfelt 36c95fdd43 Updating to version 9.2.29.v20191105 2019-11-05 10:43:15 -06:00
Jan Bartel d3153f3277 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-29 13:51:05 +11:00
Jan Bartel 7cb238db25 Issue #1743 Extra tests and code cleanups 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-24 08:41:57 +11:00
Joakim Erdfelt 1ed13b6b30 Updating to version 9.4.23-SNAPSHOT 2019-10-22 09:19:41 -05:00
Joakim Erdfelt b1e6b55512 Updating to version 9.4.22.v20191022 2019-10-22 08:20:50 -05:00
Jan Bartel e9847f6a1a Issue #1743 javadoc fixes 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-16 11:56:52 +11:00
Joakim Erdfelt d7a189fa18 Updating to version 10.0.0-SNAPSHOT 2019-10-03 12:05:26 -05:00
Joakim Erdfelt fd6a2cb9f6 Updating to version 10.0.0.alpha1 2019-10-03 11:25:06 -05:00
Jan Bartel c040614849 Issue #1743 add another unit test 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-02 18:05:23 +10:00
Jan Bartel 262759f899 Issue #1743 More refactoring and code tidying 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-02 17:16:18 +10:00
Jan Bartel 91631fd44b Issue #1743 Refactor some methods and classes 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-02 11:45:12 +10:00
Jan Bartel 2ef7160418 Issue #1743 Ensure tests stop jetty 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-10-01 11:29:00 +10:00
Jan Bartel 655fa24bfc Issue #1743 add tests; checkstyle 2019-09-30 18:33:37 +10:00
Jan Bartel c50c70ac02 Issue #1743 Support both unit and integration tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-30 11:52:44 +10:00
Joakim Erdfelt 7807eafad9 Updating to version 9.4.22-SNAPSHOT 2019-09-26 10:46:28 -05:00
Joakim Erdfelt 72970db61a Updating to version 9.4.21.v20190926 2019-09-26 09:59:15 -05:00
Jan Bartel 747315d3dc Issue #1743 WIP add unit test; stopOnShutdown 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-25 12:43:51 +10:00
Jan Bartel 557cd83713 Issue #1743 Rename mojos. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-24 17:07:03 +10:00
Jan Bartel e865cc3fd8 Issue #1743 WIP system properties; remove old code 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-24 16:37:48 +10:00
Jan Bartel 08790a45a4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-24 14:21:36 +10:00
Jan Bartel ba74af34c9 Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 16:30:19 +10:00
Jan Bartel a600a58f1c Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 10:31:46 +10:00
Jan Bartel 456e467bcb Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 10:30:20 +10:00
Jan Bartel 881f17c6be Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 09:00:03 +10:00
Jan Bartel d029ae4dab Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 08:20:57 +10:00
Jan Bartel be066959e3 Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 08:14:40 +10:00
Jan Bartel 733118687c Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 07:43:33 +10:00
Jan Bartel 61af550a56 Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-19 07:35:39 +10:00
Jan Bartel 9f296e1666 Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 18:29:14 +10:00
Jan Bartel 946955c00c Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 18:03:56 +10:00
Jan Bartel cf61839c46 Issue #1743 WIP tests 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 16:34:56 +10:00
Greg Wilkins 6a32fb0ca5 Issue #4003 Cleanup quickstart 
* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-18 16:29:19 +10:00
Greg Wilkins 1b3ee6ee17 Configuration cleanup 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-18 10:50:53 +10:00
Jan Bartel de3e104d27 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 10:50:21 +10:00
Jan Bartel ac48d3d32c Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 10:21:47 +10:00
Jan Bartel 995e0b6c59 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-18 08:12:45 +10:00
Jan Bartel 67343c5e0f Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-17 17:38:27 +10:00
Jan Bartel 62118cacb1 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-11 17:47:34 +10:00
Jan Bartel 2cffd48ab6 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-11 15:35:00 +10:00
Jan Bartel 6f0f9d5dcd Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-10 18:14:00 +10:00
Jan Bartel aec8f0a32d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-10 16:35:04 +10:00
Jan Bartel 85719e2287 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-09-10 16:14:06 +10:00
Jan Bartel b851af0a5b
Issue #4003 Fix quickstart (#4008) 
* Issue #4003 Fix quickstart.

Modes:
AUTO: use quickstart xml if present, start normally otherwise
GENERATE: re/generate quickstart xml
QUICKSTART: use a pregenerated quickstart xml, fail otherwise

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #4003 Cleanup quickstart

Removed TerminateException in favour of Server.setDryRun(boolean)
and AbstractLifeCycle.StopException

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-10 16:04:01 +10:00
Greg Wilkins 8f6e028f05 remove duplicate ignores 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 08:41:00 +10:00
olivier lamy a36af67abf Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-22 20:45:57 +10:00
Olivier Lamy fe3d3f7158
fix checkstyle in test sources (#4013) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-22 19:56:41 +10:00
Jan Bartel 60ee8ac8ee Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 2019-08-19 17:03:51 +10:00
Joakim Erdfelt f1efc99918 Updating to version 9.4.21-SNAPSHOT 2019-08-13 17:34:20 -05:00
Joakim Erdfelt 84700530e6 Updating to version 9.4.20.v20190813 2019-08-13 16:13:21 -05:00
Jan Bartel e800924068 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-13 18:10:21 +10:00
olivier lamy b0da4468da fix pom 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-10 13:24:33 +10:00
Simone Bordet 62758122c3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-10 00:39:54 +02:00
Greg Wilkins dc939d753a
Issue #3804 - Update Decorator integration for various CDI implementations (#3838) 
* Jetty Issue #3804 WELD-2587

Support CDI integration:
 + cdi2 module exposes jetty APIs
 + cdi module uses DecorationListener

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Jetty Issue #3804 WELD-2587

Remove DecoratingListener tests from test-jetty-webapp

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve CDI test

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Jetty Issue #3804 WELD-2587

Reverted test to use released CDI and cdi2 module for now.
To test new mechanism, you need to build the weld snapshot locally,
rebuild and switch to cdi module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* remove cdi2 webapp references

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* document attribute

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improved documentation

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* logging

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improved javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fixed version

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Reverted to also provide the DecoratingListener in the decorate module.
Renamed cdi-demo to weld-cdi-demo

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* revert from Weld SNAPSHOT

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* test all 3 weld integrations

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updated destory implementation to release creationalcontext

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* reverted to released Weld version

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3804 CDI integration

dispose and release context in destroy

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Improved CDI module documentation

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* WIP on OWB

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Updates from review
Parameterised CDITests

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* share webapp resources for cdi webapp test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* Initialize OWB with a SCI so that listeners can be decorated

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Added OwbDecorator so that cdi2 module can be tested with OWB

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Lookup attribute name

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Cleanup from Review

Don't do lazy bindings

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Cleanup from Review

Treat partial CDI same as no CDI

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fix maven it test no more need of weld-servlet

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* cleanup it parent pom removing non needed weld servlet

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* upgraded to Weld 3.1.2.Final

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Cleanup from Review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Cleanup from Review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 04:04:07 +02:00
Joakim Erdfelt 075040e88e Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
 2019-08-07 05:31:02 -05:00
Joakim Erdfelt 3ee665700d Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java
 2019-08-07 05:28:06 -05:00
olivier lamy 9950f6b528 yes this one was a really bad idea... 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-06 09:25:10 +10:00
Joakim Erdfelt 4d2c981718 Can't mirror 'central' to local repo for it tests, it wont download new dependencies then 2019-08-05 12:17:37 -05:00
olivier lamy ae004171e0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-30 11:21:31 +10:00
Olivier Lamy 1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its (#3902) 
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use local setttings to use mirrors

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use https

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* install build resources first to avoid checkstyle build issue

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix enforcer rule RequireUpperBoundDeps...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* not used anymore

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* force pax url to use provided settings via Jenkins withMvn

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* renove debugging System.out

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* version is defined in the project

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* cleanup after Jan review comments

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-30 11:13:54 +10:00
Jan Bartel 464f3d3e66 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-07-13 17:36:15 +02:00
olivier lamy 6df9ef3a15 Updating to version 10.0.0-SNAPSHOT 2019-07-12 06:54:56 +10:00
olivier lamy 8cbfd51e80 Updating to version 10.0.0-alpha0 2019-07-12 06:54:56 +10:00
Jan Bartel 60d20c8808 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-07-11 16:10:20 +02:00
Jan Bartel 9ef5bb48f5 Issue #1743 WIP 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-07-11 16:01:10 +02:00
olivier lamy a34e641a27 Updating to version 10.0.0-SNAPSHOT 2019-07-11 17:20:27 +10:00
olivier lamy 2e58f2f515 Updating to version 10.0.0-alpha0 2019-07-11 14:19:45 +10:00
Greg Wilkins d744d097de
Checkstyle cleanup (#3847) 
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-07-03 17:24:08 +02:00
Greg Wilkins b7a7a53a18
Jetty 10.0.x reformat (#3812) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:42:39 +02:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:40:30 +02:00
Greg Wilkins 343cf732b9
Issue #3789 XmlConfiguration Set Property (#3790) 
Issue #3789 XmlConfiguration Set Property

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-21 21:04:53 +02:00
Joakim Erdfelt 60d8661890 Merge `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
#	jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
#	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
#	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
#	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
#	jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
 2019-06-13 14:14:42 -05:00
Joakim Erdfelt 40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace 
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
 2019-06-13 14:01:35 -05:00
Joakim Erdfelt 877815e195 Issue #3708 - Adding new methods and converting codebase to use them 
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 09:56:41 -05:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt c73f849711 Fixing post-merge test errors 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 12:43:26 -05:00
Joakim Erdfelt 68a9498092 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -05:00
Joakim Erdfelt afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Simone Bordet 826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02:00
Simone Bordet a510ed31cb Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-07 09:22:31 +02:00