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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05: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
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
972dc015bb
sugar syntax changes
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10: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
fb90666931
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-06 17:24:06 +11: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
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
bfa2dbf68c
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:51:29 +01:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
Greg Wilkins
Lachlan
Joakim Erdfelt
Simone Bordet
Joakim Erdfelt
olivier lamy
Jan Bartel
Olivier Lamy