8f1975cc04
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-16 14:00:22 +11:00
2eb251a4b8
fix logging defaults to INFO
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-16 13:53:57 +11:00
f09e03c586
Issue #4156 - Session Already in Cache during forwarding ( #4159 )
...
* Issue #4156 - Adding test to replicate issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4156 Session already in cache
+ check validity of sessions in getSession(SessionHandler)
+ do not replace session in doScope if SessionHandler is the same.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-14 11:18:37 +11:00
95ccdd448e
Issue #4177 - Configure HTTP proxy with SslContextFactory.
...
Small signature fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-11 11:29:12 +02:00
6430177685
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-10 10:38:38 +02:00
c8175ec107
Fixes #4177 - Configure HTTP proxy with SslContextFactory.
...
It is now possible to pass a `SslContextFactory.Client` to HttpProxy
so that it is possible to use a keystore for the proxy communication
and another keystore for the server communication.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-09 17:37:00 +02:00
e2a493d7b0
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-08 09:52:21 +02:00
d7a189fa18
Updating to version 10.0.0-SNAPSHOT
2019-10-03 12:05:26 -05:00
fd6a2cb9f6
Updating to version 10.0.0.alpha1
2019-10-03 11:25:06 -05:00
3be178c966
Merged 'jetty-9.4.x' into 'jetty-9.4.x-2429-httpclient_backpressure'.
2019-10-03 13:17:39 +02:00
9fbc41f1d5
Fixes #4150 - Module org.eclipse.jetty.alpn.client not found, required by org.eclipse.jetty.proxy
...
Made jetty-alpn-client required by jetty-client.
Fixed groupId for test-proxy-webapp.
Added test case for the failing configuration.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 23:11:02 +02:00
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
d39f19cc23
Issue #2429 - Review HttpClient backpressure semantic.
...
Introduced a Response.DemandedContentListener to explicitly separate
the will to request more content from the notification that the content
has been consumed.
Updated all transports to follow the new semantic: rather than waiting
for the callback to complete before delivering more content, now they
wait for the demand to be positive to deliver more content.
Since now the content may be unconsumed but there can be more demand,
all transport implementation had to be changed to use RetainableByteBuffer
to retain content buffers that were not consumed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-19 17:19:25 +02:00
1b3ee6ee17
Configuration cleanup
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 10:50:53 +10:00
92b477e49f
Fixed test after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 11:29:06 +02:00
bee079c021
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-17 11:18:51 +02:00
bb27fa6cc0
Issue #3747 - Make Jetty Demo work with JPMS.
...
Added distribution test for running with JPMS.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 11:18:14 +02:00
422b9bded5
Fixes #3747 - Make Jetty Demo work with JPMS.
...
Introduced module `jdbc` and made other modules that require JDBC depend on it.
Modified demo.ini to enable the `jdbc` module because some webapp descriptor
of the demo requires JDBC classes.
Now the demo can be run fine on the module-path just by adding --jpms.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-16 22:57:55 +02:00
f942cd4687
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4058-autolock'.
2019-09-11 22:41:11 +02:00
6ae7427d55
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/pom.xml
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
2019-09-11 09:42:56 -05:00
43e10f8a5e
Merge pull request #4056 from eclipse/jetty-9.4.x-testing-embedded-examples
...
Unit Testing the Embedded Examples
2019-09-11 09:20:10 -05:00
1722acafa8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-11 09:36:59 +10:00
a563cdca76
Issue #4025 Add flushOnResponseCommit mode to sessions. ( #4049 )
...
* Issue #4025 Add flushOnCommit mode to sessions.
Added flushOnCommit mode to write a session to the backing store as the
response commits, before any bytes are returned to the client.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 09:10:35 +10:00
6e740060f7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
2019-09-10 08:22:00 -05:00
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
f6aea22979
Issue #3989 - Cleaning up FailedSelectorTest
...
+ Based on PR review
+ Squelching logging output
+ Removing stacks from ManagedSelector logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 20:35:02 -05:00
13413c8027
More testing of embedded examples
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 17:58:06 -05:00
692c017500
Fixes #4058 - Review Locker.
...
Removes the Locker class, replaced by AutoLock.
Removed usages of Locker.isLocked() from the session code
since it was not necessary.
Took the chance to do a little code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-09 16:18:46 +02:00
b7b744160f
Issue #3989 - Tests for both Restart Server and Selector
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-06 16:10:30 -05:00
f8041b23bd
Issue #3989 - Cleaning up ManagedSelector.doStop() for dead selector
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-06 14:54:01 -05:00
0596d6c352
Merge branch 'jetty-9.4.x' into jetty-9.4.x-3989-selector-failure
2019-09-06 14:35:17 -05:00
3171ad5fe6
Issue #3989 - Updating testcase to restart server on select failure
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-05 20:23:59 -05:00
20f7a473ee
Fixing License header date range
2019-09-04 16:32:52 -05:00
9305914d6a
Issue #3989 - Selector failure notification
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-04 11:16:24 -05:00
189ba7a671
Merge from 9.4.x
2019-09-02 14:49:33 -04:00
49ba6d1acb
fix typo and grammar ( #4045 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-02 14:29:50 -04:00
f6efff70d7
Issue #3989 - Selector failure notification
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-30 13:47:16 -05:00
728c96f547
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-28 11:22:59 +10:00
f4d95e0f2f
Remove blank lines for NullSessionCacheTest
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-28 11:22:14 +10:00
23c0bcaf89
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-08-28 11:05:53 +10:00
a2fc9b113b
Fix and enhance session invalidation tests.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-28 11:04:31 +10:00
6038d75153
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-27 17:47:41 +10:00
83463c2a23
Issue #3964 - Listener behavior cleanup (Jetty 9.4.x) ( #3965 )
...
Issue #3964
* Avoid creating listener list for rarely used requestAttributeListener
* AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.
* Simplified listener handling by avoiding null connector, previously
only needed for testing.
* Fixed test that assumed HttpChannel listeners were not cleared by a recycle
* 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.
* Added improved method to combine multiple HttpChannel Listeners
into a single Listener.
* Fixed MockConnector
* Added benchmark
* Improved benchmark
* Updates from review
* Removed benchmark and alternate implementations.
* Updated javadoc
* Updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-27 17:38:20 +10:00
fabc50ecc5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-27 10:56:15 +10:00
387e33acaf
Issue #4006 Fix ClusteredSessionMigrationTest ( #4010 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-27 10:53:54 +10:00
8f6e028f05
remove duplicate ignores
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-27 08:41:00 +10:00
af8587c108
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-27 08:15:41 +10:00
bde86467f4
Issue #3806 - Make Async sendError fully Async ( #3912 )
...
* Issue #3806 async sendError
Avoid using isHandled as a test withing sendError as this can be
called asynchronously and is in a race with the normal dispatch of the
request, which could also be setting handled status.
The ErrorHandler was dispatching directly to a context from within
sendError. This meant that an async thread can call sendError and be
dispatched to within the servlet container at the same time that the
original thread was still dispatched to the container.
This commit fixes that problem by using an async dispatch for error
pages within the ErrorHandler. However, this introduces a new problem
that a well behaved async app will call complete after calling
sendError. Thus we have ignore complete ISEs for the remainder of
the current async cycle.
Fixed the closing of the output after calling sendError. Do not
close if the request was async (and thus might be dispatched to an
async error) or if it is now async because the error page itself is
async.
* updates from review
* better tests
* revert ignore complete
* added some TODOs
* more TODOs
* fixed rename
* cleanup ISE and more TODOs
* refactored to call sendError for uncaught exceptions rather than onError
* more of the refactor
* extra tests for sendError from completing state
Reworked HttpChannelState and sendError so that sendError is now
just a change of state. All the work is done in the ErrorDispatch
action, including calling the ErrorHandler. Async not yet working.
Additional tests
Converted ERRORED state to a separate boolean so it can be used for
both Sync and Async dispatches.
Removed ASYNC_IO state as it was just the same as DISPATCHED
The async onError listener handling is now most likely broken.
WIP making sendError simpler and more tests pass
WIP handling async and thrown exceptions
WIP passing tests
Improved thread handling
removed bad test
Implemented error dispatch on complete properly
more fixed tests
sendError state looks committed
- Added resetContent method to leave more non-content headers during sendError
- Fixed security tests
- simplified the non dispatch error page writing. Moved towards being able to write async
* fixed gzipHandlerTest
* Updated handling of timeout errors. According to servlet spec,
exceptions thrown from onTimeout should not be passed to onError, but
just logged and ignored:
If an exception is thrown while invoking methods in an AsyncListener,
it is logged and will not affect the invocation of any other AsyncListeners.
* This changes several tests.
* Dispatcher/ContextHandler changes for new ERROR dispatch handling. Feels a bit fragile!
* Fixed tests in jetty-servlets
* Fixed tests in jetty-proxy
* more test fixes
* Fixed head handling
reverted unnecessary changes
Improved reason handling
WIP on fully async error handling.
Simplified HttpChannelState state machines to allow for async actions
during completing
more WIP on fully async error handling.
sendError and completion are not both non-blocking, without using
a startAsync operation. However we are lacking unit tests that actually
exercise those code paths.
* Simplified name of states
Added test for async completion
* Cleanups and javadoc
* Cleanups and javadoc
* remove snake case
* feedback from review
* Write error page into fixed pooled buffer
Use the response to get/release a pooled buffer into which the error
page can be written. Make it a fixed sized buffer and if it overflows
then no error page is generated (first overflow turns off showstacks
to save space).
The ErrorHandler badly needs to be refactored, but we cannot change
API in jetty-9
* More test fixes for different error page format
* minor cleanups
* Cleanup from Review
* Fixed javadoc
* cleanups and simplifications
* Cleanup from Review
* renaming and some TODOs
* Cleanup from Review
* Checkstyle fixes
* Cleanup from Review
* Code cleanups and simplifications
* fixed debug
* Cleanup from Review
* Ensure response sent before server shutdown
* removed unnecessary optimisation
* fixed duplicate from merge
* Updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-26 17:55:58 +10:00
9534940578
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-26 15:55:08 +10:00
0f8230c05b
Issue #3936 Provide write-through modes for the NullSessionCache ( #3984 )
...
* Issue #3936 Provide write-through modes for the NullSessionCache
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-26 15:22:20 +10:00
a36af67abf
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-22 20:45:57 +10:00
fe3d3f7158
fix checkstyle in test sources ( #4013 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
1ea4320a65
Adding missing license header
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-20 10:00:49 -05:00
e2ee75a40e
Fixes #3989 - Adding AsyncClose onError test
...
Requested from PR review by @gregw
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-20 09:59:53 -05:00
d4c9b017e9
Fixes #3989 - Selector restart with custom ManagedSelector
...
+ applying changed from PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-20 09:36:35 -05:00
de9677c8af
Fixes #3989 - Selector restart with custom ManagedSelector
...
+ Adds onSelectFailed(Throwable)
+ Adds startSelector()
+ Unit test to demonstrate behavior on both execution
strategies
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-19 15:50:35 -05:00
50b524bb6b
Merge branch `release-9.4.20` into `jetty-9.4.x`
2019-08-15 07:27:25 -05:00
c9c59e71b6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-08-15 13:47:58 +10:00
af6c675023
Issue #3913 Fix races in session request reference counting ( #3947 )
...
* Issue #3913 Fix races in session request reference counting
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-15 12:27:18 +10:00
9ba9df1495
fixed merge for CDITests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-15 08:13:02 +10:00
3544283865
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java
# tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
2019-08-14 09:39:06 -05:00
f1efc99918
Updating to version 9.4.21-SNAPSHOT
2019-08-13 17:34:20 -05:00
84700530e6
Updating to version 9.4.20.v20190813
2019-08-13 16:13:21 -05:00
a700907522
Issue #250 - Implement HTTP CONNECT for HTTP/2. ( #3539 )
...
Fixes #250 - Implement HTTP CONNECT for HTTP/2.
Modified HTTP/2 implementation to support the CONNECT method.
Implemented semantic defined by RFC 8441.
Implemented section 8.3 of RFC 7540.
Introduced HTTP2Client.streamIdleTimeout.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-08-13 19:07:04 +03:00
279c382a1f
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-13 15:00:38 +10:00
8c4dd7ab05
Fixed decoration changes for #3804
...
Fixed bad names in OWB webapp.
Don't have the owb jetty-web.xml on by default.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-13 11:14:44 +10:00
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
62758122c3
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-10 00:39:54 +02:00
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
bf1ece938f
Issue #3804
...
more review changes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-09 08:20:27 +10:00
bcb4c59ab2
Issue #3804 - cleanup of CDITest arguments
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-08 10:21:12 -05:00
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
516fdd45cb
Issue #3804
...
improved javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-08 16:11:02 +10:00
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
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
c310eb0fb9
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-07 13:52:16 +02:00
762767c62c
Fixes #3601 - HTTP2 stall on reset streams.
...
After review, updated the logic to always fail the transport.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-08-01 15:52:47 +02:00
f67504c4da
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-01 17:47:37 +10:00
b7fdf9f9f3
upgrade to junit 5.5.1 ( #3925 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-01 17:46:06 +10:00
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
30513f9afc
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-10 20:20:33 +10:00
3c14ceab27
avoid transitive depdency on a range version which can failed the build... ( #3862 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-10 20:19:06 +10:00
9902794988
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-07-04 21:36:13 +02:00
48209e340e
Increase wait time to ensure that the session scavenging happens.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-07-04 21:35:06 +02:00
bb1a260fa5
Merge remote-tracking branch jetty-10.0.x into jetty-10.0.x-300-CompressionPool
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-04 10:22:10 +10:00
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
9fe27eb8e3
Updated all arrays after merge of #3846
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:23:02 +02:00
5568f833e7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:53:00 +02:00
bb7fb48f08
Fix checkstyle warnings for tests. ( #3846 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
98d0737565
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-07-02 13:25:08 +02:00
89e756a21e
Fix checkstyle warnings
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-02 13:20:48 +02:00
e8d21364c3
Merge remote-tracking branch 'jetty-9.4.x-300-CompressionPool' into jetty-10.0.x-300-CompressionPool
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-02 13:41:05 +10:00
3d923c0cc9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-07-01 15:43:20 +02:00
e26179e8e9
Issue #3799 Programmatic listeners from ServletContextListeners. ( #3824 )
...
* Issue #3799 Programmatic listeners from ServletContextListeners.
Ensure programmatic listeners added from ServletContextListeners are
called.
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #3799 add distribution test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-01 15:14:19 +02:00
3d7409e341
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-07-01 15:09:14 +02:00
4f74e19463
Issue #3749 Fix memory leak for AsyncContextListeners with annotations ( #3769 )
...
* Issue #3749 Fix memory leak for AsyncContextListeners with annotations
Also make InjectionCollection and LifeCycleCollection threadsafe for
readers with concurrent modifications.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-01 14:46:40 +02:00
9c6c1990b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:16:53 +02:00
a42ad99871
Misc minor checkstyle fixes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:13:34 +02:00
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
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
85f198419d
Issue #3804 - Disabling CDI tests until Weld can be fixed
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 18:28:54 -05:00
c7b6110267
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 16:05:17 -05:00
6ca87a0de1
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# tests/test-webapps/pom.xml
2019-06-21 14:44:56 -05:00
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
075333a627
Merge `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
2019-06-20 15:37:48 -05:00
666d1cfd0b
fixed https fragility
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 12:32:14 +02:00
a7b5430f96
fixed test to avoid local network fragility
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 12:24:03 +02:00
b7bd4aa850
removed debug dump
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 10:41:04 +02:00
f28a1792d7
fixed websocket test of jetty-test-webapp which cannot be accessed remotely
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-19 10:38:28 +02:00
2f4f42a7df
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3731-cdi-testing`
2019-06-18 11:30:47 -05:00
cc966dd1f2
Issue #3700 - Using newer felix version
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-18 10:13:56 -05:00
372ed1455f
Issue #3661 - review of exposed classes in jetty-websocket-server ( #3779 )
...
* Issue #3661 - review of exposed classes in jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3762 - cleanups of jetty-websocket-server
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-17 17:12:46 +10:00
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
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
db30cbd184
Issue #3700 - Adding felix webapp tests to discover OSGi issues earlier
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 14:37:13 -05:00
dc23b8da6a
Issue #3731 - Bumping up version now that 9.4.19 is released
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:58:36 -05:00
0d4aa4ea49
Issue #3731 - updating `cdi2` module expectations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
4f82a23a7a
Issue #3731 - fixing license headers
2019-06-12 13:49:14 -05:00
c6e5371ea2
Issue #3731 - Cleaning up test-cdi2-webapp to be the minimal needed
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
715bbbb6a2
Issue #3731 - Adding CDI2 tests to test-distribution
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
85566d0377
Issue #3731 - adding cdi2 test webapp
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
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
33fe55c339
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
...
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()
Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 11:25:50 -05:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
81f22e3873
Issue #3748 - @Resource field not injected in Jetty Demo.
...
Adding Jetty 10 specific bits to make the test pass.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-10 19:23:04 +02:00
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
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
1683df2da6
Putting new JMH test in correct place (fix from last merge)
2019-06-10 10:04:30 -05:00
826d68e80a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:41:47 +02:00
e179851ccf
Merge pull request #3752 from eclipse/jetty-9.4.x-3751-dtd-consistent-use
...
Issue #3751 - Use Modern DTD/FPI consistently
2019-06-10 11:30:02 +02:00
5346980dbb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:29:25 +02:00
450d7f42b2
Issue #3748 - Adding distribution tests for AsyncListenerServlet
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:15:29 -05:00
246e36289d
Issue #3748 - Adding testcase for AsyncListener with @Resource
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 12:14:13 -05:00
63109108a8
Issue #3751 - Use Modern DTD/FPI consistently
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
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
bf53925cfb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-06 17:58:49 +02:00
8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample ( #3721 )
...
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:44:41 +10:00
03baa6bc9b
Issue #3733 do not destroyForcibly on close otherwise child processes are not killed via shutdownHook ( #3742 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:43:41 +10:00
043521ce26
Cleanup webappconfiguration ( #3703 )
...
* Cleanup webappconfiguration
* formatting fix
* cleanup examples and OSGi
* disable classloader test until 9.4.19 is released with #3726 is fixed
* cleanup from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 11:53:56 +02:00
2ba4cb2924
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-03 17:31:50 +02:00
301934cc68
Issue #3719 clean up modules ( #3720 )
...
* Issue #3719 clean up modules
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-03 11:11:18 +02:00
3208af6c1c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-06-03 10:29:36 +02:00
dec10044e0
Jetty 9.4.x 3722 session destroy listeners ( #3723 )
...
* Issue #3722 Use webapp classloader for HttpSessionListener.sessionDestroyed calls
2019-06-03 10:27:38 +02:00
a3e28578f1
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-30 14:43:52 +02:00
eb837293ad
Replaced usage of deprecated "replacement" with "location".
...
Code cleanup & formatting.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 14:39:28 +02:00
294450908d
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-29 17:41:35 +02:00
68fa24e463
fix bad merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-23 16:31:02 +10:00
d377db5d26
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-23 14:18:39 +10:00
d37038496e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-22 23:21:02 +02:00
2256c532be
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-22 10:30:25 +02:00
e8f11d3c7e
Added small performance improvements
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-22 08:27:53 +02:00
b0bc9c9200
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-17 16:47:45 +02:00
665b1929e0
Small minor performance improvements
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-15 20:17:33 +02:00
c578798370
Fixes #3197 - Use jetty specific websocket API jar.
...
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-10 19:33:12 +02:00
a305660c54
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/config/etc/jetty-ssl-context.xml
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-05-07 13:54:27 -05:00
7e7920a969
Merge pull request #3622 from eclipse/jetty-9.4.x_use_local_repo_dist_test
...
force using local repo to download module dependencies
2019-05-07 11:46:43 -07:00
8a4f4d390c
Issue #3620 - Applying changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
13c9d24f08
force using local repo to download module dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-03 19:03:20 +10:00
2fa8a0a943
Issue #3620 - Fixing unixsocket distribution test
...
+ Giving download more time to complete
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 19:30:19 -05:00
78a71b71cc
Issue #3620 - Exit Server.start() if LifeCycle.start() fails
...
+ DeploymentManager will hang onto errors encountered and report them
en-masse if on it's own doStart().
+ Added jetty-deploy test cases.
+ Added test-distribution test case.
+ Updated test-distribution to allow this kind of test case.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 18:51:06 -05:00
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
41ab9baf8c
Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00
df716e1b23
Migrating away from junit5 deprecated isIn() to is(in())
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
2b93a4e7ea
Updating jetty-test-helper + junit5 + hamcrest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:23:55 -05:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
f28bfa9377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-29 13:21:59 +02:00
ab174d1015
Issue #3597 Fix session persistence classloading for deep structures ( #3602 )
...
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
2019-04-29 12:05:34 +02:00
29b960551f
Merge branch `release-9.4.17` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
3b29d2ccda
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 19:31:53 +10:00
2d23cb0ecf
ignore the correct one
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 19:31:13 +10:00
c428fc1b62
weird only this annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 15:48:52 +10:00
4f38e9f488
oops missed annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 14:12:21 +10:00
0b6c27e276
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 13:01:42 +10:00
6395e7f25a
ignore test which cannot work with hazelcast tests
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 12:40:45 +10:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
5882d63ba7
Updating to version 9.3.28-SNAPSHOT
2019-04-18 13:54:17 -05:00
d3e249f869
Updating to version 9.3.27.v20190418
2019-04-18 13:10:03 -05:00
2c14d93885
Updating to version 9.2.29-SNAPSHOT
2019-04-18 12:17:07 -05:00
1dffa36fe3
Updating to version 9.2.28.v20190418
2019-04-18 11:23:17 -05:00
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
c2e81f5584
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-infinispan/infinispan-common/src/main/java/org/eclipse/jetty/session/infinispan/WebAppMarshaller.java
# jetty-infinispan/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/MultiParts.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-18 08:24:10 -05:00
b6809f5555
Jetty 9.4.x 2140 infinispan expired sessions ( #3457 )
...
Infinispan and hazelcast changes to scavenge zombie expired sessions.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-18 17:24:25 +10:00
f7354bc90e
Update test webapp page headings to Jetty 10.
2019-04-17 15:18:38 +10:00
9311fdd9c3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-17 15:16:10 +10:00
3dd0172abd
Issue #3395 Add tests for serializing dynamic proxies in sessions. ( #3499 )
...
* Issue #3395 Add tests for serializing dynamic proxies in sessions.
2019-04-17 15:04:28 +10:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
c7de2f5b9f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-07 10:56:17 +02:00
f62192336f
Disable once again UNIX_SOCKET tests due to JNR bugs.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-07 10:47:56 +02:00
92e55025a5
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-06 16:53:44 +02:00
80a1989e28
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 15:43:03 +02:00
bd0f5ba313
Updated jnr-unixsocket dependencies to 0.22 in *.mod.
...
Fixed Unix Socket distribution test.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-06 15:39:20 +02:00
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
aa7e9ee060
Merge pull request #3474 from eclipse/jetty-9.4.x-3180-review_unixsocket
...
Issue #3180 - Review client support for Unix sockets.
2019-04-06 11:55:29 +02:00
6d3ca09281
use standard java api to delete tmp file unix sock file
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 12:05:25 +10:00
2b39c7e406
fix some mod files and add a distribution test for unixsocket
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 09:21:14 +11:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
7478c04351
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# 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-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-http-spi/pom.xml
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# 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/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/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-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/pom.xml
# jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-servlets/pom.xml
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# 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-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-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
2019-04-03 17:47:18 -05:00
ec273b7cf0
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:13:19 +02:00
c0c2996339
fixed annotationtest
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 18:18:48 +11:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
9c13cf3a52
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 17:37:56 +02:00
c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory
...
Issue #3464 - Split SslContextFactory into Client and Server
2019-04-02 12:39:37 +02:00
81960e3da8
Issue #3484 - make WebSocketServlet generic
...
WebSocketServlet could only be used with the jetty-websocket-api
make this generic and add implementation in websocket-server
this prevents jetty-websocket-server from needing to use core classes
can cause class cast exceptions from a webapp due conflicts between the
clients version of core classes and those provided by the container
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-28 16:22:10 +11:00
b759a50450
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-27 16:54:09 +11:00
1e4be0a98e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-27 15:07:39 +11:00
ed03682071
Issue #3487 WebAppClassLoader does not definePackage
...
Added a test to the test-server-spec to demonstrate the issue
2019-03-26 13:56:00 +11:00
b351631c0d
Adding both WebSocket tests to /test-integration/ to verify behavior
...
that is causing problems from within OSGi.
+ Renamed TestableJettyServer to XmlBasedJettyServer to avoid
it being picked up as a Test class (due it starting with the
name "Test")
+ Renamed .addConfiguration() to .addXmlConfiguration() to
reflect true nature, and also to avoid naming confusion
with new Configuration infrastructure in Jetty.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-21 14:31:23 -05:00
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
4cbc933220
Issue #3180 - Review client support for Unix sockets.
...
Updated code after reviews.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 23:36:37 +01:00
0f6496abb3
Issue #3180 - Review client support for Unix sockets.
...
Fixed tests on Jenkins by shortening the Unix socket file name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 18:55:09 +01:00
bfc5b1fac5
Issue #3180 - Review client support for Unix sockets.
...
Reviewed the implementation.
Got rid of the single channel stored in the HttpClientTransport.
Re-enabled tests on the Unix socket transport.
Updated JNR to 0.22.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 17:37:12 +01:00
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
...
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
c7f66521cb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3012-Compliance
2019-03-13 14:59:02 +11:00
8e21c968d5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-12 12:14:46 +11:00
4f1b28eb3c
Issue #3415 re enable infinispan test with using correct version of infinispan ( #3443 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-12 11:20:05 +11:00
0ecbdec9d0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3012-Compliance
2019-03-12 09:24:06 +11:00
c6617884e8
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Simplified ProxyProtocolClientConnectionFactory
to use Origin.Address rather than InetSocketAddress.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-11 11:11:42 +01:00
29913f93bf
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Added javadocs and small changes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-08 17:14:41 +01:00
69ea8877f3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-08 10:46:11 +11:00
beb4881af4
Issue #3394 Remove unused JAASGroup,RoleCheckPolicy,StrictRoleCheckPolicy ( #3433 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-08 10:44:39 +11:00
92e120bcac
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3012-Compliance
2019-03-07 07:46:32 +11:00
a31ba98e29
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-07 07:45:28 +11:00
aa211b033d
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Introduced `HttpClientTransportDynamic` to be able to switch transport dynamically.
Refactored other transports and HttpDestination, removing now unnecessary classes.
Introduced ProxyProtocolClientConnectionFactory and used it for testing.
Updated OSGi tests now that jetty-client depends on jetty-alpn-client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-06 10:26:10 +01:00
a652ce20ee
Issue #3012 refactored HttpCompliance
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-06 17:20:31 +11:00
dbf0d2e6be
Issue #3421 Duplicate session set-cookie ( #3426 )
...
Added Response.replaceCookieuse replaceCookie in sessions
unit tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-06 14:44:48 +11:00
11755539e8
Jetty 9.4.x 3337 session serialization tests ( #3409 )
...
* Issue #3337 Session serialization tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-06 10:13:20 +11:00
5658bf96f6
Issue #1676 - Removing Deprecated Resource.getURL()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 10:21:42 -05:00
e476cec6d3
Issue #1676 - Removing deprecated methods and classes
...
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
ddc904f1f6
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# 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-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmh/pom.xml
# jetty-jmh/src/main/java/org/eclipse/jetty/http/jmh/MultiPartBenchmark.java
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/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/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/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-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/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-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/AbstractJsrRemote.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrCallable.java
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnPartialTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTrackingTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoAnnotatedSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoConfiguredSocket.java
# jetty-websocket/jetty-websocket-tests/pom.xml
# 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/BadNetworkTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java
# jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/IncomingFrames.java
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
# jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/LogicalConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpoint.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.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/extensions/AbstractExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/identity/IdentityExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FramePipes.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/DelegatedContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/WebSocketContainerScope.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ClosePayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorParserRoundtripTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/PingPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/RFC6455ExamplesParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_1.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase7_3.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/DummyIncomingFrames.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/FrameFlusherTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadClient.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/DummyConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/IncomingFramesCapture.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketProtocolTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SessionSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-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-http2-webapp/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-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-02-28 08:26:58 -05:00
0f442e019a
disable infinispan test for jdk12
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-28 07:24:55 +10:00
c3719b2bab
Add jdk12 build in Jenkinsfile ( #3376 )
...
* add jdk12 build stage
* test last release of infinispan for jdk12 build
* fix upperBound dependency for jboss logging
* upgrade juniper to 5.4.0 and disable infinispan test if JRE.JAVA_12
* Fixed annotations to exclude any JDK > 11 for 3 tests.
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:37:21 +10:00
cff63f2b6a
Merge of `jetty-9.4.x` to `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
aec2ebd27d
issue #2878 add an aggregated javadoc jar excluding some tests packages
...
+ force attach and use default phase bind (package)
+ fixing some dependencies to build aggregate javadoc jar
+ configure release plugin to build aggregated javadoc jar
+ test javadoc build with jdk11 including aggregated javadoc
+ Fixing bad javadoc
+ Excluding tests from aggregate-javadoc
+ Cannot aggregate-javadoc on CI (requires clean build of snapshot to work)
+ standardizing javadoc config
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-18 17:44:51 -05:00
0e7a2738d5
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-02-18 16:53:53 -05:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
2e67a26dd8
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Fixed concurrency issue while reading the console logs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-15 18:12:45 +01:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
8dba440317
Issue #3279 - WebSocket Close Refactoring
...
+ FrameFlusher "close" frames are detected during
enqueue and sets the state properly for failing
other frames after it
+ Moving away from Blockhead(Client|Server) to using actual implementations
+ Moved tests to /jetty-websocket-tests/ to be able to use actual impl
for both sides of testcase (client and server)
+ Corrected FrameFlusher terminate/close to not fail the close frame
itself, but only frames that arrive AFTER the close frame.
+ Moving WebSocketCloseTest to jetty-websocket-tests to avoid
using BlockheadClient / BlockheadServer in testing
+ Cleanup of unnecessary modifiers on interface
+ Logging error if @OnWebSocketError is undeclared
+ IOState removed
+ New ConnectionState tracks connection basics in a simpler
method then IOState did.
+ No tracking of Remote close initiated (not needed)
+ IncomingFrames.incomingError() removed
+ Session delegates to Connection for all state changes
+ Errors can be communicated to application multiple times
+ Close is only communicated once
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-15 10:07:24 -05:00
14d09bac5c
Fixing post-merge test failure in QuickStartTest
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-14 14:56:26 -05:00
b9797b01eb
Merge pull request #3352 from eclipse/jetty-10.0.x-3351-restructure_unixsocket
...
Fixed #3351 - Restructure jetty-unixsocket module.
2019-02-13 15:19:51 +01:00
92417c0954
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 15:19:09 +01:00
1b904c0b77
Fixed #3351 - Restructure jetty-unixsocket module.
...
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01:00
009a4659a7
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Made sure web apps are unpacked in a directory
within $jetty.base to avoid cluttering /tmp.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 19:21:43 +01:00
1c55e2bf79
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.annotation -> jakarta.annotation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
a1e6d5856a
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.transaction -> jakarta.transaction.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
5ce3d1bd61
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 11:23:56 +01:00
265cc79225
jetty-distribution is test scope
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 18:22:39 +10:00
2d88b3b959
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
a1a02d9942
fix CI test, distribution must be build first as we want to use a fresh build of the distro
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 12:25:57 +10:00
3c665dfc1c
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Added missing license header.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:36:14 +01:00
b0207dd90d
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Reworked the implementation.
Deleted unused stuff.
Written more tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 19:37:49 +01:00
cbc9a9cff3
apply some comments from review
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 21:34:52 +10:00
214bc03270
DistributionTester is definitely a better name
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
dd4041dae1
cleanup not used variable
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
85fd1db963
add jpms test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
d9bfece0cc
rename class, add more javadoc
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
6a42d3ba08
Issue #3343 add api/tools to test jetty distribution
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
972dc015bb
sugar syntax changes
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
b786a2c826
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:27:45 +01:00
e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api
...
Issue #3162 - Use Jetty specific Servlet API jar.
2019-02-07 17:33:14 +01:00
9286cdcf09
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated references to Servlet jar to "jetty-servlet-api".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 13:08:26 +01:00
11bb07da1b
Disable test until fix for #3334
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 08:30:42 +11:00
fb90666931
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-06 17:24:06 +11:00
33f314e9f5
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:51 +01:00
3c9c78c835
Issue #132 - ClientConnector abstraction.
...
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.
Refactored also HTTP2Client to reference ClientConnector.
Refactored tests accordingly to the changes introduced in the
implementations.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
e939cd2188
Merge pull request #3267 from eclipse/jetty-10.0.x-132_client_connector
...
Issue #132 - ClientConnector abstraction.
2019-01-31 17:37:10 +01:00
13cee0bc4d
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, take 2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 16:51:20 +01:00
88408375ab
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, since
the change in the default endPointIdentificationAlgorithm
makes the test failing as the certificates are not valid
for the local host, which is different depending on where
the tests are run (locally, jenkins).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 15:31:35 +01:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
6145fd7468
Issue #3166 add autobahn testsuite running via autobahn maven plugin ( #3292 )
...
Issue #3166 Add autobahn profile to automatically run autobahn test suite in Jenkins
2019-01-25 15:10:24 +10:00
5095c8a7b2
Issue #3288 - Correcting Jetty WebSocket API artifactIds
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
6c4ee083be
Issue #132 - ClientConnector abstraction.
...
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.
Refactored also HTTP2Client to reference ClientConnector.
Refactored tests accordingly to the changes introduced in the
implementations.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-17 10:43:03 +01:00
4f65799a7b
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping
...
Jetty 10.0.x #3167 refactor websocket mapping
2019-01-16 09:13:42 +11:00
64edaff68a
Fixes #2095 - Remove FastCGI multiplexing.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-11 11:56:42 +01:00
9b0c8336ba
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:34:33 +11:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
729bf8299c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-23 13:51:01 +11:00
f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci ( #3221 )
...
* issue #3166 add autobahn test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:16:23 +10:00
27a0adf94a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-22 10:33:05 +11:00
8c7c5a5d01
Issue #3167 Improve websocket initialization
...
Improve on #3167 with major refactor of the context initialization of
websocket:
+ The Javax and Jetty sides are more symmetric - both use shared
filter and mapping.
+ Regularised usage of beans rather than attributes for ws components
+ Customization is now part of the mapping, so ws are configured by
how they were mapped and not by who does the upgrade.
+ Filter still can be configured to customize defaults
+ Servlet can be configured to customize any ws mappings added via the
servlet
There is still some strangeness as the WebSocketServlet is mostly
generic, yet can only map Jetty API websockets.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-22 10:30:37 +11:00
bd4933b33c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-21 21:48:36 +10:00
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
503bd71d4c
Issue #3202
...
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
06bbab50f9
Issue #3202
...
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
34b6ecec6c
Issue #3202 Ensure sessions created during async are cleaned up.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-18 09:32:12 +11:00
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
e8d468b3e1
work in progress
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 14:45:23 +01:00
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Jan Bartel
Chris Walker
康智冬
olivier lamy
Lachlan Roberts
olivier lamy
Michael Hausegger
Joakim Erdfelt