olivier lamy
3b29d2ccda
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 19:31:53 +10:00
olivier lamy
2d23cb0ecf
ignore the correct one
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 19:31:13 +10:00
olivier lamy
c428fc1b62
weird only this annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 15:48:52 +10:00
olivier lamy
4f38e9f488
oops missed annotations
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-23 14:12:21 +10:00
olivier lamy
0b6c27e276
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-04-23 13:01:42 +10:00
olivier lamy
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
Joakim Erdfelt
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
Joakim Erdfelt
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
Joakim Erdfelt
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
Jan Bartel
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
Jan Bartel
f7354bc90e
Update test webapp page headings to Jetty 10.
2019-04-17 15:18:38 +10:00
Jan Bartel
9311fdd9c3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-17 15:16:10 +10:00
Jan Bartel
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
Joakim Erdfelt
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
Joakim Erdfelt
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
Simone Bordet
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
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
92e55025a5
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-06 16:53:44 +02:00
Simone Bordet
80a1989e28
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 15:43:03 +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
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +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
Simone Bordet
ec273b7cf0
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:13:19 +02: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
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
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
Lachlan Roberts
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
Greg Wilkins
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
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
Joakim Erdfelt
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
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
Simone Bordet
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
Greg Wilkins
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
Jan Bartel
8e21c968d5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-12 12:14:46 +11: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
Greg Wilkins
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
Simone Bordet
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
Simone Bordet
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
Jan Bartel
69ea8877f3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-08 10:46:11 +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
