Commit Graph

1197 Commits

Author SHA1 Message Date
Lachlan Roberts 60c56d8856 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-02 23:43:42 +11:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
dependabot[bot] 40acf60936
Bump geronimo-annotation_1.3_spec from 1.1 to 1.3 (#5552)
Bumps geronimo-annotation_1.3_spec from 1.1 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-02 19:31:04 +10:00
dependabot[bot] e70e995f0c
Bump openwebbeans.version from 2.0.18 to 2.0.19 (#5551)
Bumps `openwebbeans.version` from 2.0.18 to 2.0.19.

Updates `openwebbeans-web` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Updates `openwebbeans-jetty9` from 2.0.18 to 2.0.19
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-02 19:30:29 +10:00
Lachlan Roberts 59883af8bf update version to 9.4.34-SNAPSHOT
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 15:00:38 +11:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 12:43:31 +11:00
dependabot[bot] 0342bf517e
Bump geronimo-jcdi_2.0_spec from 1.2 to 1.3
Bumps geronimo-jcdi_2.0_spec from 1.2 to 1.3.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-26 06:23:26 +00:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
dependabot[bot] 5eeae2ad5c
Bump jsp-api from 2.1 to 2.2 (#5462)
Bumps jsp-api from 2.1 to 2.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 20:42:15 +10:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
Lachlan Roberts 6cd70ce136 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient 2020-10-15 14:12:21 +11:00
Lachlan Roberts 26f4062d93 Parameterize testWebsocketClientInWebapp over both http and https
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 16:35:58 +11:00
dependabot[bot] 2919d565db
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.2
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 06:22:46 +00:00
Joakim Erdfelt 345484929c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 08:53:15 -05:00
Joakim Erdfelt c2655295ac
Eliminating no-longer relevant comment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 08:50:37 -05:00
Joakim Erdfelt fe03a3e6c2
Bump OpenWebBeans from 2.0.11 to 2.0.18
+ Brings in ServletContainerInitializer fix from 2.0.12

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 07:31:20 -05:00
Joakim Erdfelt 76eac0eeee
Merge pull request #5389 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.geronimo.specs-geronimo-atinject_1.0_spec-1.2
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
2020-10-05 05:36:53 -05:00
dependabot[bot] 47c2f060eb
Bump javax.servlet-api from 3.1.0 to 4.0.1
Bumps [javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1.
- [Release notes](https://github.com/javaee/servlet-spec/releases)
- [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:42 +00:00
dependabot[bot] d987a0d94d
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:38 +00:00
Lachlan Roberts 5b96f6f984 Issue #5320 - Run jetty-websocket-httpclient.xml with server class access.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 12:38:17 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 1233ae108e
Fixing bad html links 2020-09-30 09:23:35 -05:00
Lachlan Roberts 00f05cb94e Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-30 15:11:05 +10:00
Joakim Erdfelt b22ce9c044
Reorg of /demos/ with focus on demo-spec downstream dependencies. (#5367)
* Reorg of /demos/ with focus on spec modules
* Reworking demo-mock-resources into /demos/ proper
* Removing old /tests/ modules that no longer have a reason for existing.
* Making demo-mock-resources a formal module
* demo-jndi and demo-spec now depend on it
* Restoring jetty-maven-plugin config lost in demo-jetty-webapp
* Fixing jetty-maven-plugin realm usage to be local

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:37:22 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358)
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
Joakim Erdfelt 9e54e9a081
Post merge cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 18:04:20 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363)
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 17:39:59 -05:00
Joakim Erdfelt 2942b9ea74
Minor updates for demo-base
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 09:06:27 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 13:35:19 -05:00
Greg Wilkins 5654437cc9 demo-jaas does not depend on demo-jndi
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-23 19:31:24 +02:00
Greg Wilkins 5332f3f685 demo-jaas depends on jaas
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-23 19:10:42 +02:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
Joakim Erdfelt be07e84cd7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-22 09:15:59 -05:00
Joakim Erdfelt a99a832206
Issue #5137 - Cleanup of WebAppContextTest
+ Cleanup of test-servlet-spec webapp
+ Removing unused methods
+ Commented System.err.println moved to java.util.logging
+ General checkstyle cleanup (empty lines, spacing, etc)
+ Eliminate bogus WebApp LIB ordering tests.
+ No ClassLoader has a order guarantee.
+ Moving HttpSessionListenerTest contents to existing SessionListenerTest
+ Cleanup of SessionListenerTest with eye to resource cleanup
+ Removing ServletContextListenerTest as it duplicates tests
+ Restoring WebAppClassLoaderTest test method
+ `ordering()` is now `testClashingResource()` and properly
  tests assumptions when dealing with a ClassLoader.
  The old test assumed guaranteed order from a ClassLoader,
  which is not a feature of any Java ClassLoader.
  Especially so for URLClassLoader.
+ Restoring clashing resource test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-22 08:46:11 -05:00
Greg Wilkins d1f6cbb9da added jndi and jaas dependencies
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-22 13:28:10 +02:00
Greg Wilkins 3768b09d6f added jstl
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-22 13:07:14 +02:00
Joakim Erdfelt 770f251cbb
Issue #5264 - Fixing demo-jndi deps for javax.mail
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 16:48:50 -05:00
Joakim Erdfelt c002305cb2
Issue #5264 - Fixing demo-jndi config
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 15:53:45 -05:00
Joakim Erdfelt 533d64cda1
Issue #5264 - Fixing deploy status on demo webapps
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 14:47:31 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 13:57:23 -05:00
gregw afe5044d8c Fixes #5281
Added work module to create work directory
reviewed by janbartel
2020-09-16 16:20:16 +02:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257)
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

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

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-14 18:07:16 +02:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177)
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

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

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

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

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

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

* updates from review

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

* Feedback from review
2020-09-07 14:00:20 +02:00
Joakim Erdfelt a54ed928ab
Issue #5174 - Reorganized jetty-distribution
+ Updating license / notice files for EPLv2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-03 07:13:58 -05:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Greg Wilkins 7adbf247ec
Issue #5093 Static UrlEncoded (#5098)
* Issue #5093 Static UrlEncoded

Updated UrlEncoded to static only class with no synchronization

* Fixed additional tests

* fixed formatting

Signed-off-by: gregw <gregw@webtide.com>
2020-07-30 17:57:38 +02:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock.
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
olivier lamy eefe3d202b revert fail release
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts b033d6078f Issue #5012 - Remove unneeded dependency for test-jaas-webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-03 09:54:18 +02:00
Lachlan Roberts 6407322d9c Issue #5012 - Remove unneeded dependency for test-jaas-webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-02 11:15:34 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Lachlan 2e1c01ac8c
Merge pull request #4723 from eclipse/jetty-10.0.x-WebSocketServlet
Issue #4722 - remove websocket-servlet
2020-05-07 22:45:04 +10:00
Lachlan Roberts e5cca92199 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 15:46:03 +10:00
Lachlan Roberts b0e57ffd6d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-LinkageErrorInvestigation 2020-04-29 22:52:33 +10:00
Lachlan Roberts bf5d4ea554 Issue #4800 - Revert MethodHandle changes & update DistributionTests
- It seems it is correct to use the `MethodHandles.publicLookup().in()`
but this does not work if same webapp is deployed twice, so the
MethodHandle changes have been reverted and the test has been disabled
until a resolution to https://bugs.openjdk.java.net/browse/JDK-8244090.

- The DistributionTest has been changed to properly reproduce the issue.
There must be a class in the signature of the websocket endpoint which
is available to both webapps and the client must send and receive an echo
message to ensure that the onOpen MethodHandle is actually invoked.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-29 22:52:26 +10:00
Greg Wilkins 8c7e34f37d
Jetty 10.0.x immutable meta data (#4777)
Made HttpURI, HttpFields and MetaData immutable.  The first two follow the same builder pattern and MetaData is constructor injection only.

* Immutable version of HttpFields

Preserve API and usage of HttpFields class while providing a read only interface and immutable implementation.

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

* Immutable version of HttpFields

Use an ArrayList in HttpFields. While slightly slower than the array, it will mostly be used as a builder pattern for an Immutable

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

* Immutable version of HttpFields

Fixed exception type.

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

* Immutable version of HttpFields

asImmutable method

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

* Immutable MetaData

Made HttpURIU immutable with a builder pattern.
MetaData immutable and working within http module.

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

* Immutable MetaData

Fixes from review

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

* Immutable MetaData

Passing tests upto and including jetty-server

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

* Immutable MetaData

Cleanup of HttpURI.Builder API as suggested in PR.

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

* Immutable MetaData

Added builder for MetaData.Request

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

* Immutable MetaData

more api fixes

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

* Immutable MetaData

WIP making HttpFiels itself immutable.  Currently working up to jetty-servlet.

Need to consider if content-length really is meta data and how much and when can we trust it.

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

* Immutable MetaData

WIP

Need to consider if content-length really is meta data and how much and when can we trust it. Also need to consider difference between h2 and h1 authority in metadata.

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

* Immutable MetaData WIP

jetty-client and jetty-servlet passing tests.

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

* Immutable MetaData WIP

Better align the style of immutability between `HttpFields` and `HttpURI`.
They both now have static build() and from() methods, plus Builder and Immutable implementations.
Potentially `Builder` could be renamed as `Mutable`

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

* Immutable MetaData WIP

http2-server tests passed

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

* Immutable MetaData WIP

http2-client tests passed

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

* Immutable MetaData WIP

cleann build?

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

* Immutable MetaData WIP

fix

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

* Immutable MetaData WIP

more test fixes

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

* Immutable MetaData WIP

Cleanups, mostly using EMPTY when appropriate.

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

* Immutable MetaData WIP

Cleanups, use immutable

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

* Immutable MetaData WIP

No trailers for connect

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

* Immutable MetaData WIP

Fix CONNECT path handling

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

* Immutable MetaData WIP

fixed rewrite query handling

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

* Immutable MetaData WIP

rename Builders to Muttables

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

* Immutable MetaData WIP

misc cleanups

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

* Immutable MetaData WIP

Revert to using arrays due to garbage generated by streams and iterators (12% of a simple benchmark!).
Even if this garbage is an artifact of the JIT being disabled by observation, it can hide other allocations, so best to just use simple arrays!

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

* Immutable MetaData WIP

More optimizations and better test coverage.

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

* Immutable Metadata

various cleanups

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

* Immutable MetaData WIP

More optimizations

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

* Immutable MetaData WIP

review changes

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

* Immutable MetaData WIP

changes after review:
 + less usage of Mutable
 + more usage of EMPTY
 + restored fragment handling

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

* Immutable MetaData WIP

changes after review:
 + less usage of Mutable
 + less usage of asImmutable

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

* Immutable MetaData WIP

changes after review:
 + less usage of Mutable

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

* Immutable MetaData

changes after review:
 + better handling of URI in ContextHandler

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

* Immutable MetaData

changes after review:
 + downcast in test to access mutable response headers.

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

* Immutable MetaData

changes after review:
 + use put instead of add for one time headers

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

* private

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-28 13:36:44 +02:00
Lachlan Roberts 6ee0f2ebbc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet 2020-04-23 13:53:10 +10:00
Greg Wilkins 2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection (#4757)
* Use HandlerList instead of HandlerCollection

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

* Use HandlerList instead of HandlerCollection

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:42:28 +02:00
olivier lamy 5199e78587 those jars are provided as they come from jetty distribution if not they try to load slf4j impl
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-15 18:29:46 +10:00
Simone Bordet 013acca012 Issue #4765 - Review GzipHandler inside ServletContextHandler.
Fixed XML files.
Restored ServletContextHandler.setGzipHandler() and
deprecated it in case it's used from user's XML files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-14 12:19:52 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Joakim Erdfelt 08df1d9f73
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-restore-owb-hack 2020-04-07 09:44:07 -05:00
Jan Bartel 0a4879e521
Issue #4707 wrong value for ServletContext.setSessionTimeout (#4708)
* Issue #4707 wrong value for ServletContext.setSessionTimeout

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-26 11:13:42 +01:00
Joakim Erdfelt f3bd6611f4
Fix OWB (Open WebBeans) tests.
+ OWB needs init-parameter to allow it's own
  ServletContainerInitializer found at
  org.apache.webbeans.servlet.WebBeansConfigurationListener$Auto
  to execute and properly add the required Listener for
  OWB to function.
+ See OWB-1296

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-25 07:12:29 -05:00
Joakim Erdfelt 7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
Joakim Erdfelt 8456fcd039
Issue #4685 - Adding jetty-slf4j-impl to test wars WEB-INF/lib/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:24:15 -05:00
Joakim Erdfelt 43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
Joakim Erdfelt 2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
Olivier Lamy e05712c26b
upgrade openwebbeans-web to 2.0.15 (#4666)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-20 10:16:12 +10:00
Joakim Erdfelt 874ae80ba4
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 18:49:51 -05:00
Joakim Erdfelt a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Joakim Erdfelt 57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
Joakim Erdfelt 8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
       org.eclipse.jetty.util.log.Logger but as
  simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
  to org.eclipse.jetty.logging.StacklessLogging found in
  the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
  + and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
  + Also adding note to jetty-util classes that are used by
    jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Lachlan Roberts 55748f12c2 Issue #4581 - remove unnecessary javadoc on Override methods
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
Olivier Lamy abdb9f2ff6
Jetty 10.0.x methodhandles lookup linkage (#4552)
* use a lookup dedicated to the target class (webapp classloader) to avoid collision with server classloader

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

* cleanup war test dependencies

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

* remove empty lines

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

* make it clear it is a bad websocket webapp only for testing purpose and add a good websocket webapp

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

* no need anymore of this dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-09 11:59:57 +10:00
Simone Bordet ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
2020-01-30 19:28:49 +01:00
Simone Bordet 8bd1a7f5bc Using only non-obfuscated passwords in tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 18:48:08 +01:00
Jan Bartel 45b3a34170
Issue #4432 Implement get/setSessionTimeout for ServletContext (#4458)
* Issue #4432 Implement get/setSessionTimeout for ServletContext

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 17:26:55 +01:00
Jan Bartel b520ca6d30
Issue #4433 - Implement ServletContext.addJspFile (#4463)
* Issue #4433 Implement ServletContext.addJspFile

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:45:35 +01:00
Joakim Erdfelt 56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00