-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5563 from eclipse/jetty-10.0.x-5320-WebSocketHttp…
…Client2 Issue #5320 - using jetty-websocket-httpclient.xml within webapp Jetty 10
- Loading branch information
Showing
17 changed files
with
150 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
jetty-websocket/websocket-jetty-client/src/main/config/modules/websocket-jetty-client.mod
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html | ||
|
||
[description] | ||
Expose the Jetty WebSocket Client classes to deployed web applications. | ||
|
||
[tags] | ||
websocket | ||
|
||
[depend] | ||
client | ||
annotations | ||
|
||
[lib] | ||
lib/websocket/websocket-core-common-${jetty.version}.jar | ||
lib/websocket/websocket-core-client-${jetty.version}.jar | ||
lib/websocket/websocket-util-${jetty.version}.jar | ||
lib/websocket/websocket-jetty-api-${jetty.version}.jar | ||
lib/websocket/websocket-jetty-common-${jetty.version}.jar | ||
lib/websocket/websocket-jetty-client-${jetty.version}.jar | ||
|
||
[jpms] | ||
# The implementation needs to access method handles in | ||
# classes that are in the web application classloader. | ||
add-reads: org.eclipse.jetty.websocket.jetty.common=ALL-UNNAMED |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...ain/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// | ||
// ======================================================================== | ||
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. | ||
// | ||
// This program and the accompanying materials are made available under | ||
// the terms of the Eclipse Public License 2.0 which is available at | ||
// https://www.eclipse.org/legal/epl-2.0 | ||
// | ||
// This Source Code may also be made available under the following | ||
// Secondary Licenses when the conditions for such availability set | ||
// forth in the Eclipse Public License, v. 2.0 are satisfied: | ||
// the Apache License v2.0 which is available at | ||
// https://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
// ======================================================================== | ||
// | ||
|
||
package org.eclipse.jetty.websocket.client.config; | ||
|
||
import org.eclipse.jetty.webapp.AbstractConfiguration; | ||
import org.eclipse.jetty.webapp.FragmentConfiguration; | ||
import org.eclipse.jetty.webapp.MetaInfConfiguration; | ||
import org.eclipse.jetty.webapp.WebAppConfiguration; | ||
import org.eclipse.jetty.webapp.WebInfConfiguration; | ||
import org.eclipse.jetty.webapp.WebXmlConfiguration; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
/** | ||
* <p>Websocket Configuration</p> | ||
* <p>This configuration configures the WebAppContext server/system classes to | ||
* be able to see the {@code org.eclipse.jetty.websocket.client} package.</p> | ||
*/ | ||
public class JettyWebSocketClientConfiguration extends AbstractConfiguration | ||
{ | ||
private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketClientConfiguration.class); | ||
|
||
public JettyWebSocketClientConfiguration() | ||
{ | ||
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); | ||
addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); | ||
|
||
protectAndExpose("org.eclipse.jetty.websocket.api."); | ||
protectAndExpose("org.eclipse.jetty.websocket.client."); | ||
hide("org.eclipse.jetty.client.impl."); | ||
hide("org.eclipse.jetty.client.config."); | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
...-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.eclipse.jetty.websocket.client.config.JettyWebSocketClientConfiguration |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.