734 Commits

Author SHA1 Message Date
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