Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,057 Commits 55 Branches 466 Tags
Commit Graph

1692 Commits

Author SHA1 Message Date
Simone Bordet
b9797b01eb
Merge pull request #3352 from eclipse/jetty-10.0.x-3351-restructure_unixsocket 
Fixed #3351 - Restructure jetty-unixsocket module.
 2019-02-13 15:19:51 +01:00
Simone Bordet
92417c0954 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-13 15:19:09 +01:00
Simone Bordet
1b904c0b77 Fixed #3351 - Restructure jetty-unixsocket module. 
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-13 09:16:56 +01: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
Simone Bordet
1c55e2bf79 Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.annotation -> jakarta.annotation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 18:56:16 +01:00
Simone Bordet
a1e6d5856a Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.transaction -> jakarta.transaction.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 14:41:05 +01:00
Simone Bordet
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
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
b786a2c826 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-11 10:27:45 +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
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
Greg Wilkins
11bb07da1b Disable test until fix for #3334 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-07 08:30:42 +11: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
33f314e9f5 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:51:51 +01:00
Simone Bordet
3c9c78c835 Issue #132 - ClientConnector abstraction. 
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.

Refactored also HTTP2Client to reference ClientConnector.

Refactored tests accordingly to the changes introduced in the
implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:49:12 +01:00
Simone Bordet
e939cd2188
Merge pull request #3267 from eclipse/jetty-10.0.x-132_client_connector 
Issue #132 - ClientConnector abstraction.
 2019-01-31 17:37:10 +01: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
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
Olivier Lamy
6145fd7468
Issue #3166 add autobahn testsuite running via autobahn maven plugin (#3292) 
Issue #3166 Add autobahn profile to automatically run autobahn test suite in Jenkins
 2019-01-25 15:10:24 +10:00
Joakim Erdfelt
5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-23 15:58:11 -06:00
Simone Bordet
6c4ee083be Issue #132 - ClientConnector abstraction. 
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.

Refactored also HTTP2Client to reference ClientConnector.

Refactored tests accordingly to the changes introduced in the
implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-17 10:43:03 +01:00
Greg Wilkins
4f65799a7b
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping 
Jetty 10.0.x #3167 refactor websocket mapping
 2019-01-16 09:13:42 +11:00
Simone Bordet
64edaff68a Fixes #2095 - Remove FastCGI multiplexing. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-11 11:56:42 +01: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
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
f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci (#3221) 
*  issue #3166 add autobahn test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-22 21:16:23 +10:00
Greg Wilkins
27a0adf94a 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-22 10:33:05 +11: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
olivier lamy
bd4933b33c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-21 21:48:36 +10:00
Jan Bartel
4abc4f8dd4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-12-19 10:54:41 +11: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
1176b267b5 removed -impl from websocket name and fixed SCI 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 10:05:10 +11:00
Greg Wilkins
e8d468b3e1 work in progress 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-05 14:45:23 +01:00
Greg Wilkins
81ca90b1f6 Issue #113 
Deletes the deprecated NcsaRequestLog classes
Updates modules to use CustomRequestLog by default
Move jetty-customrequestlog.xml from home to base

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-01 16:31:23 +01:00