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
Lachlan
af899b0e68
Merge pull request #4602 from eclipse/jetty-10.0.x-4340-ServiceLoader
...
Issue #4340 - Continue after ServiceLoader ServiceConfigurationError
2020-03-25 10:30:38 +11: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
9492a5379c
Issue #4685 - eliminate <version> in jetty-slf4j-impl
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:42:36 -05:00
Lachlan Roberts
04cecaaaef
Issue #4340 - Change usages to more closely follow previous behaviours
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-20 17:02:49 +11:00
Lachlan Roberts
30d36ed68c
Merge branch jetty-10.0.x into jetty-10.0.x-4340-ServiceLoader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 15:00:30 +11: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
Lachlan Roberts
7af220dade
Issue #4340 - shortcut method for the serviceStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-16 09:42:32 +11:00
Lachlan Roberts
a6b2b3ff98
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4340-ServiceLoader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 17:02:26 +11:00
Lachlan Roberts
edd671146d
Issue #4340 - ServiceLoader stream which doesn't break if hasNext throws
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 16:59:33 +11:00
Jan Bartel
dfd3875dbc
Jetty 10.0.x 4506 metadata complete ( #4587 )
...
* Issue #4506 Do not introspect annotations on metadata-complete fragments
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-09 15:34:04 +01:00
Lachlan Roberts
97c55e27cc
Issue #4340 - remove TypeUtil.load and use flatMap() on streams instead
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 11:06:32 +11:00
Lachlan Roberts
6832912d49
Issue #4340 - Implement TypeUtil.load(ServiceLoader) with Streams
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-28 12:15:27 +11:00
Lachlan Roberts
a277c30b81
Issue #4340 - Move ServiceLoaderUtil.load method to TypeUtil.loadAll
...
- increase MAX_ERRORS to 1000
- introduce a loadFirst method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-26 10:26:29 +11:00
Lachlan Roberts
a7f4d2606b
Issue #4340 - always pass in ServiceLoader to ServiceLoaderUtil
...
this prevents errors where jetty-util must declare it uses the provider
class in module.info
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 19:49:23 +11:00
Lachlan Roberts
81424f1f44
Issue #4340 - Continuing after ServiceLoader ServiceConfigurationError
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 19:49:22 +11: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
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
86e3333916
Issue #4434 Implement context default request/response encodings. ( #4455 )
...
* Issue #4434 Implement context default request/response encodings.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-17 00:40:06 +11:00
Jan Bartel
f1474a4a3f
Issue #4431 Add tests for default-context-path ( #4467 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-17 00:39:16 +11:00
Joakim Erdfelt
01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
# jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
# jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
# jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.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/WebSocketClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.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/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.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/TestABCase4.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.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/events/JettyAnnotatedScannerTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.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/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.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/ab/TestABCase1.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
# pom.xml
# tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
# tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
# tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
# tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
Joakim Erdfelt
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
Simone Bordet
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
Simone Bordet
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
Simone Bordet
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
Simone Bordet
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
Simone Bordet
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
Joakim Erdfelt
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
olivier lamy
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
olivier lamy
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Joakim Erdfelt
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
Joakim Erdfelt
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
Simone Bordet
e3bb5a7515
Issue #4225 - Fix JPMS transitivity.
...
Reworked all module-info.java files to take into
account JPMS transitivity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 18:17:35 +01:00
Jan Bartel
f99eb29195
Issue #4369 Update jsp documenation; remove old config from webdefault.xml ( #4384 )
...
* Issue #4369 Update jsp documenation; remove old config from webdefault.xml
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:15:02 +11:00
Joakim Erdfelt
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
Joakim Erdfelt
363d5f2df3
Updating to version 9.4.24.v20191120
2019-11-20 15:25:01 -06:00
Joakim Erdfelt
453d41940b
Updating to version 9.4.24-SNAPSHOT
2019-11-18 13:52:51 -06:00
Joakim Erdfelt
abbccc65d6
Updating to version 9.4.23.v20191118
2019-11-18 13:09:44 -06:00
Greg Wilkins
8fef35c573
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-14 13:30:23 +11:00
Greg Wilkins
b24c6ce68d
Issue #2340 ServletContext cleanup ( #4307 )
...
* Issue #2340 ServletContext cleanup
A minor cleanup of the ServletContext implementation classes.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2340 ServletContext cleanup
cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-14 11:52:03 +11:00
Simone Bordet
a9299b2426
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-13 17:03:57 +01:00
Simone Bordet
e3f31a86a2
Fixed flaky test testUpload_Multipart().
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-13 16:46:11 +01:00
Greg Wilkins
46a3368f3b
Issue #2578 - Listener behavior cleanup (Jetty 10.0.x) ( #3966 )
...
* Avoid creating listener list for rarely used requestAttributeListener
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Keep a list of EventListeners in the AbstractConnector to make it
more efficient to add and iterate over them.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Use addEventListener rather than bespoke listener methods.
Support getEventListenerBeans at Container level for fast lookup
improve javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed test
more javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Don't use null for empty lists of listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fix merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Resolve differences between eventListeners added as beans and beans
added as EventListeners. The behaviour should now be the same
regardless of how they listener is added and all listeners are now
beans.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Add only SelectorManager listeners to manager from connector
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed old TODO
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
connector cannot be null
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed the ability to set/clear context listeners
Instead just remove non-durable ones.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Simplified listener handling by avoiding null connector, previously
only needed for testing.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Fixed test that assumed HttpChannel listeners were not cleared by a recycle
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
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.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners - import
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4003 Cleanup quickstart
* Fixed tests that scan for "Started" on console
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 11:04:38 +11:00
Joakim Erdfelt
774160c7ec
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java
2019-11-12 14:53:38 -06:00
Joakim Erdfelt
4ab910bdc0
Issue #4287 - Move getUriLastPathSegment() to URIUtil
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-07 15:52:00 -06:00
Joakim Erdfelt
cc58a74662
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java
2019-11-07 15:37:30 -06:00
Joakim Erdfelt
64a916e6ec
Issue #4173 - use JarFileResource's Jar java.io.File object if present
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-07 05:11:48 -06:00
Joakim Erdfelt
2d9f128410
Issue #4173 - simplify base name lookup
...
+ Some cleanup of logging
+ Exception during getResourceBaseName() results in empty canonical segment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-06 16:06:05 -06:00
Joakim Erdfelt
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00