Skip to content

First fixes for issues discovered during our move from CDO 4.7 to CDO 4.22#73

Open
mPorhel wants to merge 13 commits intoeclipse-cdo:masterfrom
mPorhel:mpo/fixesMoveFrom47to422
Open

First fixes for issues discovered during our move from CDO 4.7 to CDO 4.22#73
mPorhel wants to merge 13 commits intoeclipse-cdo:masterfrom
mPorhel:mpo/fixesMoveFrom47to422

Conversation

@mPorhel
Copy link
Copy Markdown
Contributor

@mPorhel mPorhel commented Aug 20, 2024

Hi @estepper,

Contribution of 4 easy fixes on top of PRs which fixe WS support (#64) and provide WSS support (#30).

I have other contributions to come already uploaded to https://github.com/mPorhel/cdo/commits/mpo/fixesMoveFrom47to422/ they might require more advanced review and tests.

mPorhel and others added 13 commits August 20, 2024 12:35
…ipse-cdo#63

The following tests were broken for cdo.net4j.ws protocol:
- org.eclipse.emf.cdo.tests.ViewProviderTest.testConnectionAware()
- org.eclipse.emf.cdo.tests.ViewProviderTest.testSerialize()

Since commit 3f0d7aa done on 2020-09-26
08:21:50 for [567178] CDOURIHandler.canHandle(URI) is too lax
https://bugs.eclipse.org/bugs/show_bug.cgi?id=567178
Change-Id: Ic384f293730e76e46df4bf299fea361670431f89
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
Change-Id: Ic4145e79bec9d63fba5683340f14e7a08e0897c2
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
The default acceptor name is used when a ws acceptor is declared in the
cdo-server.xml with no listenAddress attribute.

Change-Id: I363ba3b3e6ac8a53c8ad621de3003a65c4359b65
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
- Extract the specific WSSClientConnector in its own class
- Make WSSConnectorFactory extend WSConnectorFactory to share common
code
- provide a CDONet4jViewProvider for wss transport
- register CDOResourceFactory for cdo.net4j.wss protocol

Change-Id: I1ed8b557ce159dc67563da6bf975b71d802ddb43
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
- Configure the proxy if necessary, according to org.eclipse.core.net
settings.
- Add org.eclipse.core.net to the net4j.ws plugin dependencies
- Add a proxy configuration method to the WSConnectorFactory, and call
it right after the WebSocketClient creation
- Use proxy data to build BasicAuthentication.BasicResult
- The Net4jWebSocketServlet might be deployed with a target path for
which Jetty expects basic authentication. This commits adds a a way to
use this kind of deployment in tests environments, it is not suitable in
production as it uses system properties.

Change-Id: I50e0f53fca3b27c18e00c721ddb524ca6267b70b
Signed-off-by: William Piers <william.piers@obeo.fr>
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
Change-Id: I5f063032b034691ae2462dfcf351a62ebaa0950c
Signed-off-by: Stephane Drapeau <stephane.drapeau@obeo.fr>
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
Change-Id: I5cc6b1e8b065c7aff583d226442b52a2b59dfcc7
Signed-off-by: Robert Schulk <Robert.Schulk@byom.de>
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
This commit disable the action "Checkout", "Checkout As..." and "Create
Branch..." if the branching is not supported.

Change-Id: Ic342305e252001c3a7a75d2ae82c0d29bd2bbe6f
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
Change-Id: I0ea1b3ab877ce95de8b78cad76b16f444458f79c
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
Change-Id: I74139a7f226acbe03189a72f948cdcf1cce82477
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
Change-Id: I99f607805b8a04ade285862f371c12e795fdc1e9
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
@estepper
Copy link
Copy Markdown
Contributor

I've just updated the master branch so that it can build 4.29...

@estepper
Copy link
Copy Markdown
Contributor

Hi Maxime, do you think we still need this? What is it? ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants