Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,098 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

2783 Commits

Author SHA1 Message Date
Joakim Erdfelt 14d09bac5c Fixing post-merge test failure in QuickStartTest 
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
 2019-02-14 14:56:26 -05:00
Joakim Erdfelt 7b686fa4b6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-14 10:25:59 -05:00
Joakim Erdfelt 8969c9a18c Issue #3278 - more cleanup based on review of older codebase with simone 2019-02-14 08:02:24 -05:00
Joakim Erdfelt a105c44856 Issue #3278 - code reformatting 2019-02-14 07:48:05 -05:00
Joakim Erdfelt 432ed1f584 Issue #3278 - changes from review with simone 2019-02-14 07:43:17 -05:00
Joakim Erdfelt 1150f20ed9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:17:42 -05:00
Joakim Erdfelt a6c626a891 Fixing Javadoc 2019-02-13 17:17:11 -05:00
Joakim Erdfelt 7ee7554b8f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:09:38 -05:00
Simone Bordet ae207bd6dc Fixes #3320 - Review Jetty 10 module-info.java. 
After review, keeping "requires static" only if the
module tree can be built without the static module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 21:17:58 +01:00
Simone Bordet b9f89af847 Fixes #3320 - Review Jetty 10 module-info.java. 
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-08 17:30:27 +01:00
Simone Bordet 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
Simone Bordet 6d44b13945 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-02-07 10:44:40 +01:00
Simone Bordet 47871fb41e Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient. 
Added javadocs after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-06 22:31:28 +01:00
Joakim Erdfelt 12628adc10 Issue #3278 - ResourceCollection NPE 
+ Adding tests + more NPE / ISE / IAE fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-06 11:46:34 -06:00
Jan Bartel fb90666931 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-06 17:24:06 +11:00
Simone Bordet 8964608bfc Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient. 
Added a SslHandshakeListener to SslConnection that performs
the host name verification (only on the client) if the
HostnameVerifier has been configured in SslContextFactory.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-05 15:48:17 +01:00
Jan Bartel ebef147d93 Issue #3278 Empty ResourceCollection throws NPE 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-02-05 16:14:18 +11:00
Joakim Erdfelt 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
Greg Wilkins 84d74ba1de Issue #3290 async onOpen, onClose and onError 
Changes after review:
 + removed Adaptor from FrameHandler, so all non test usages of
   FrameHandler now use async API.
 + Fixed sequencing of multiple async operation so callback is notified
   after completion (created more Callback.from utilities for this)
 + fixed import order

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:33:37 +11:00
Simone Bordet e4d78608a7 Issue #3049 - Warn on common SslContextFactory problematic configurations. 
Made default endpointIdentificationAlgorithm=HTTPS to avoid warnings
when SslContextFactory is used on a server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-23 17:31:41 +01:00
Greg Wilkins 05dfbd18cd Issue #2175 cleanups after review 
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-22 13:25:29 +11:00
Greg Wilkins 664ddef6fd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 09:44:53 +11:00
Joakim Erdfelt 74df6bf1a9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-maven-plugin/src/it/it-parent-pom/pom.xml
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
#	jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
#	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
#	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
#	jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
#	jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
 2019-01-11 12:11:38 -06:00
Greg Wilkins 9b0c8336ba Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 08:34:33 +11:00
Joakim Erdfelt 87c82ae644 Issue #3242 - Allow Dumpable to control how self is represented 
+ Do not rely on Object.toString() for representing self (aka:this)
  in the dump output.  Using Object.toString() can result in lots
  of duplicated information in the dump (and super long lines)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:47:17 -06:00
olivier lamy 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10: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 729bf8299c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-23 13:51:01 +11:00
Olivier Lamy ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 (#3209) 
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-22 10:01:48 +10:00
Greg Wilkins 8c7c5a5d01 Issue #3167 Improve websocket initialization 
Improve on #3167 with major refactor of the context initialization of
websocket:
  + The Javax and Jetty sides are more symmetric - both use shared
    filter and mapping.
  + Regularised usage of beans rather than attributes for ws components
  + Customization is now part of the mapping, so ws are configured by
    how they were mapped and not by who does the upgrade.
  + Filter still can be configured to customize defaults
  + Servlet can be configured to customize any ws mappings added via the
    servlet

There is still some strangeness as the WebSocketServlet is mostly
generic, yet can only map Jetty API websockets.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-22 10:30:37 +11:00
Greg Wilkins 52d0d62594 Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 09:36:13 +11:00
Greg Wilkins 8320d88698 Disable test that fails 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-11 18:02:07 +11:00
Olivier Lamy 0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) (#3183) 
* surefire.argLine replaced by jetty.surefire.argLine

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-06 09:09:06 +10:00
olivier lamy c0655ce634 Revert "fix argLine inheritance (#3177)" 
This reverts commit 3e6ab2d1ac.
 2018-12-03 13:25:00 +10:00
Olivier Lamy 3e6ab2d1ac
fix argLine inheritance (#3177) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-03 11:20:20 +10:00
Simone Bordet 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
Greg Wilkins 1e15e3e941 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-24 16:49:40 +01:00
Greg Wilkins 92317a7bb4 Issue #3132 improve dump readability 
fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-23 16:54:36 +01:00
Jan Bartel 506e4dc682 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-23 16:45:32 +01:00
Greg Wilkins fc0d2569ef Issue #3132 improve dump readability 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-22 18:08:46 +01:00
Simone Bordet 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
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Simone Bordet aaa9a1e410 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-13 18:12:16 +01:00
Simone Bordet f2ed692a1b
Merge pull request #3099 from eclipse/jetty-9.4.x-HttpClient-dump-improvements 
Fixes Issue #3103 - HttpClient buffer leak found by dump improvements

The leak problem was an additional, unnecessary, call retain() in ResponseNotifier.notifyContent() that was leaking `ByteBuffer`s.
 2018-11-13 18:04:17 +01:00
Greg Wilkins d0afc63cd5 Fixing HttpClient tests to configure before start 2018-11-13 14:22:19 +01:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
Simone Bordet 422f4d9341 Issue #3085 - Restore Dump methods for backwards compatibility reasons. 
Removed dead code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-09 18:53:50 +01:00
Simone Bordet 2fd6266f62 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-09 18:25:03 +01:00