Commit Graph

1536 Commits

Author SHA1 Message Date
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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
olivier lamy 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
olivier lamy 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
Joakim Erdfelt 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
Greg Wilkins c0c2996339 fixed annotationtest
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 18:18:48 +11:00
Greg Wilkins 9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins 7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11:00
Simone Bordet 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
Greg Wilkins 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
Greg Wilkins 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
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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
Olivier Lamy 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
Jan Bartel 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
Greg Wilkins 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
Jan Bartel 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
olivier lamy 0f442e019a disable infinispan test for jdk12
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-28 07:24:55 +10:00
Olivier Lamy 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
olivier lamy 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
Joakim Erdfelt 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
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Simone Bordet 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
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Joakim Erdfelt 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
Simone Bordet 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
olivier lamy 265cc79225 jetty-distribution is test scope
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 18:22:39 +10:00
Simone Bordet 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
olivier lamy 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
Simone Bordet 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
Simone Bordet 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
olivier lamy cbc9a9cff3 apply some comments from review
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 21:34:52 +10:00
olivier lamy 214bc03270 DistributionTester is definitely a better name
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy dd4041dae1 cleanup not used variable
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 85fd1db963 add jpms test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy d9bfece0cc rename class, add more javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 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
olivier lamy 972dc015bb sugar syntax changes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
Simone Bordet 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
Simone Bordet 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
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Greg Wilkins 503bd71d4c Issue #3202
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
Greg Wilkins 06bbab50f9 Issue #3202
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
Jan Bartel 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
Greg Wilkins e7d4f55891 Issue #113
Use CustomRequestLog in examples.
Convenience constructors

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:13:12 +01:00
Jan Bartel 4e672c6b27
Issue #2646 - Better handle concurrent calls to change session id and invalidate within a context (#2670)
* Issue #2646 handle concurrent invalidate/changeid calls

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-23 16:15:27 +01:00
olivier lamy 33eccf82dc remove non used test-dispatch-webapp
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-21 15:56:39 +10:00