Websocket updates #1055
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,4 +16,5 @@ release.properties | |
| dist/ | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
| ddf-ui-deplist.out | ||
| **/.java-version | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,51 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright (c) Codice Foundation | ||
| * | ||
| * This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either | ||
| * version 3 of the License, or any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at | ||
| * <http://www.gnu.org/licenses/lgpl.html>. | ||
| * | ||
| **/ | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>backend</artifactId> | ||
| <groupId>org.codice.ddf.search</groupId> | ||
| <version>5.2.19-SNAPSHOT</version> | ||
| </parent> | ||
| <packaging>bundle</packaging> | ||
|
|
||
| <artifactId>catalog-ui-websockets</artifactId> | ||
| <name>DDF :: Catalog :: UI :: Websockets</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>ddf.security.servlet</groupId> | ||
| <artifactId>security-servlet-web-socket-api</artifactId> | ||
| <version>${ddf.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> | ||
| <Web-ContextPath>/search/catalog/ws</Web-ContextPath> | ||
|
There was a problem hiding this comment. Register as a WAB. Pax web listens for websockets created in WABs (but not the old websocket annotations) |
||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
|
|
||
| </project> | ||
This file contains hidden or 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,15 @@ | ||
| package org.codice.ddf.catalog.ui.websockets; | ||
|
|
||
| import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; | ||
| import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; | ||
| import org.eclipse.jetty.websocket.servlet.WebSocketCreator; | ||
|
|
||
| public class CustomWebSocketCreator implements WebSocketCreator { | ||
|
|
||
| @Override | ||
| public Object createWebSocket( | ||
| ServletUpgradeRequest servletUpgradeRequest, ServletUpgradeResponse servletUpgradeResponse) { | ||
| return StaticHolder.webSocketCreator.createWebSocket( | ||
| servletUpgradeRequest, servletUpgradeResponse); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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,11 @@ | ||
| package org.codice.ddf.catalog.ui.websockets; | ||
|
|
||
| import org.eclipse.jetty.websocket.servlet.WebSocketCreator; | ||
|
|
||
| public class StaticHolder { | ||
| public static WebSocketCreator webSocketCreator; | ||
|
|
||
| public StaticHolder(WebSocketCreator webSocketCreator) { | ||
| StaticHolder.webSocketCreator = webSocketCreator; | ||
| } | ||
| } |
This file contains hidden or 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,14 @@ | ||
| <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> | ||
|
|
||
|
|
||
| <reference id="websocketCreator" | ||
| interface="org.eclipse.jetty.websocket.servlet.WebSocketCreator" | ||
| filter="(name=secureWebsocketCreatorSearchCatalog)" | ||
| availability="optional"/> | ||
|
|
||
| <bean id="staticHolder" class="org.codice.ddf.catalog.ui.websockets.StaticHolder"> | ||
| <argument ref="websocketCreator"/> | ||
| </bean> | ||
|
|
||
|
|
||
| </blueprint> |
This file contains hidden or 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 hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer register a standard servlet for websockets. The specifications pax web adheres to are for osgi's whiteboard pattern - which is for http. As a result websockets aren't directly supported through whiteboard servlet registration.