Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,419 Commits 77 Branches 465 Tags 371 MiB
Commit Graph

19419 Commits

Author SHA1 Message Date
Olivier Lamy 02c247be5f
include test sources in checkstyle report (#3948) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-13 10:20:55 +10:00
Simone Bordet 20bbeeebdf Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-12 17:47:02 +02:00
Simone Bordet 46e1896322 Fixes #3960 - Fix HttpConfiguration copy constructor. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-12 17:42:54 +02:00
Simone Bordet 76612ea7ca Updated dependency to h2spec to 0.6. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-12 17:38:34 +02:00
Greg Wilkins 5b1b7b0a57 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-12 17:22:15 +10:00
Greg Wilkins 699f832632 Fixed test for symlinked directory 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-12 17:21:49 +10:00
Greg Wilkins e08d421efc Fixed merge of PR #3946 from eclipse/jetty-9.4.x-3804-Decoration-rename 
Removed cdi2 module from #3946 for Issue #3804 in jetty-10

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-12 12:06:45 +10:00
olivier lamy b0da4468da fix pom 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-10 13:24:33 +10:00
olivier lamy 8d2b4dc6f0 remove duplicate dependency 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-10 13:22:04 +10:00
Simone Bordet 62758122c3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-10 00:39:54 +02:00
Joakim Erdfelt e7a1978556
Merge pull request #3946 from eclipse/jetty-9.4.x-3804-Decoration-rename 
Issue #3804 CDI integration rename
 2019-08-09 08:43:07 -05:00
Simone Bordet 27c0ae605f Issue #3804 - CDI integration rename. 
Fixed javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-09 11:25:00 +02:00
Olivier Lamy 50aa1cf786
Jetty 9.4.x release faster (no need of triggering plugins already triggered) (#3944) 
* source:jar javadoc:jar are already triggered by eclipse-release profile so no need to call directly as it add more jars to deploy :)

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

* no need of sources jar in release profile as it is already part of normal build, and use jar-no-fork in normal to avoid forking another lifecycle

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

* no need of triggering gpg plugin again as it is part of the release-jetty.sh script

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-09 11:24:31 +10:00
Greg Wilkins 093b39be09 Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-09 09:23:17 +10:00
Greg Wilkins bf1ece938f Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-09 08:20:27 +10:00
Joakim Erdfelt bcb4c59ab2 Issue #3804 - cleanup of CDITest arguments 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-08 10:21:12 -05:00
Olivier Lamy 503a52273e
Jetty 9.4.x fix some part of the code assuming cast to HttpServletRequest is possible (#3945) 
* code assume request is HttpServletRequest whereas it can be ServletRequestWrapper, this fix some failing tck tests

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

* return directly if the instance is already HttpServlet*Wrapper

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

* checkstyle

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

* changes after review

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

* checkstyle

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

* checkstyle and cleanup import

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-08 20:46:19 +10:00
Greg Wilkins eb4be618ee Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 19:03:59 +10:00
Lachlan 3f34301660
do not echo part content in MultiPartTest (#3942) 
* sanitize xml from multipart upload in MultiPartTest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* no longer echoing back part content

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-08 17:55:31 +10:00
Greg Wilkins 516fdd45cb Issue #3804 
improved javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 16:11:02 +10:00
Greg Wilkins 9d497084d4 Issue #3804 
Rename attributes and classes to have a more regular pattern.
The DecoratingListener is now extened by the
CdiDecoratingListener which is used by the cdi-decorate module

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 15:21:06 +10:00
Greg Wilkins 70fcd3d145 Issue #3804 CDI integration 
Rename attributes and classes to have a more regular pattern.
The DecoratingListener is now extened by the
CdiDecoratingListener which is used by the cdi-decorate module

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 12:24:41 +10: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 259ef7cf7a
Merge pull request #3943 from eclipse/jetty-9.4.x-checkstyle-remove-abbrev-name 
Removing `AbbreviationAsWordInName` module
 2019-08-07 18:11:40 -05:00
Joakim Erdfelt 3b5543b575 Removing `AbbreviationAsWordInName` module 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-07 18:08:07 -05:00
Simone Bordet 2e2cde69e9
Merge pull request #3899 from eclipse/jetty-9.4.x-3856-maxForm_contentLength_behavior 
Fixes #3856 - Different behaviour with maxFormContentSize=0 if Content-Length header is present/missing.
 2019-08-07 19:46:49 +03:00
Simone Bordet 632c916608 Fixes #3856 - Different behaviour with maxFormContentSize=0 if Content-Length header is present/missing. 
Removed duplicated, unused, code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 17:35:10 +02:00
Joakim Erdfelt 5dbccaed4e Merge branch jetty-9.4.x into jetty-10.0.x 2019-08-07 07:43:36 -05:00
Joakim Erdfelt cb87d7049e
Merge pull request #3923 from eclipse/jetty-9.4.x-3906-seekablebytechannel-fallback 
Issue #3906 - Handling SeekableByteChannel.position(long) Exception
 2019-08-07 07:43:16 -05:00
Simone Bordet c310eb0fb9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-07 13:52:16 +02:00
Simone Bordet e64e3309d3
Merge pull request #3908 from eclipse/jetty-9.4.x-3601-http2_stall_on_reset_stream 
Fixes #3601 - HTTP2 stall on reset streams.
 2019-08-07 14:49:55 +03: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
Simone Bordet 264ceb143d Fixes #3601 - HTTP2 stall on reset streams. 
After review, introduced WriteFlusher.isPending() and now using that
in the test case to test for TCP congestion.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 11:48:31 +02:00
Simone Bordet fa0e7850be
Merge pull request #3938 from eclipse/jetty-9.4.x-3929-http2_deadlock_stopping_server 
Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop().
 2019-08-07 12:34:15 +03:00
Simone Bordet 6c4412bd75
Merge pull request #3941 from eclipse/jetty-9.4.x-3940-double_log_initialization 
Fixes #3940 - Double initialization of Log.
 2019-08-07 11:52:58 +03:00
Simone Bordet b9b79a6ad7 Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop(). 
Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 10:51:27 +02:00
Simone Bordet 4b7ba20aae Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop(). 
Updated code after review.
Now a managed failed bean is restarted if its container is restarted.
Added more test cases.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 10:44:04 +02:00
Simone Bordet 1fd24b3fca Fixes #3940 - Double initialization of Log. 
Removed LOG field, it was used improperly (log and rethrow)
and it's now unnecessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 10:04:52 +02:00
Simone Bordet 632e9c57a8 Fixes #3940 - Double initialization of Log. 
Restructured the class and cleaned up the code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 10:04:07 +02:00
Simone Bordet 689e6d71a2 Fixes #3940 - Double initialization of Log. 
Removed usage of StringUtil.
Moved fields together at top of the class to avoid
class initialization ordering issues.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-07 09:59:23 +02:00
Simone Bordet f484b83c2e Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop(). 
Added test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-06 11:50:29 +02:00
Olivier Lamy 0a1722d652
order test and cleanup map (#3932) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-06 11:10:41 +10: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 69763a7163
Merge pull request #3885 from eclipse/jetty-9.4.x-3884-websocket-frame-listener 
Issue #3884 - Pure WebSocketFrameListener should not process Continuation events
 2019-08-05 14:17:08 -05:00
Simone Bordet 6c1b5982a5 Fixes #3929 - Deadlock between new HTTP2Connection() and Server.stop(). 
Previously beans were started if they were not running, which
included them being in a STOPPING state.
Now beans are only started if they are in STOPPED state.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-05 21:08:55 +02:00
Joakim Erdfelt b8f29630ed Issue #3884 - Updating tests and fixing merge 
+ Test cases have been updated based on PR review
+ Fixing merge from `jetty-9.4.x` that caused a duplicate
  JettyListenerEventDriver.onContinuationFrame() method

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-05 12:52:20 -05:00
Joakim Erdfelt 1ee771e991 Merge branch `jetty-9.4.x` into `jetty-9.4.x-3884-websocket-frame-listener` 2019-08-05 12:27:53 -05: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
Simone Bordet 6a6a45e60c
Merge pull request #3920 from eclipse/jetty-10.0.x-3897-new_docs_1 
Draft 1 for week 1.
 2019-08-05 17:37:49 +03:00