Commit b13d227d authored by Jörg Richter's avatar Jörg Richter

Remove config `dmx.websockets.port` (#384)

parent c5130b2c
Pipeline #10520 passed with stages
in 8 minutes and 29 seconds
......@@ -21,7 +21,8 @@ public class WebSocketServiceImpl implements WebSocketService {
// ------------------------------------------------------------------------------------------------------- Constants
private static final String WEBSOCKETS_URL = System.getProperty("dmx.websockets.url", "ws://localhost:8081");
private static final String WEBSOCKETS_URL = System.getProperty("dmx.websockets.url",
"ws://localhost:8080/websocket");
// Note: the default value is required in case no config file is in effect. This applies when DM is started
// via feature:install from Karaf. The default value must match the value defined in project POM.
......
......@@ -23,9 +23,6 @@ org.apache.felix.https.keystore.key.password = ${org.apache.felix.https.keystore
# WebSockets
# The port the WebSocket server opens for accepting connections
dmx.websockets.port = ${dmx.websockets.port}
# The URL the WebSocket clients use to connect to the WebSocket server
dmx.websockets.url = ${dmx.websockets.url}
......
......@@ -8,7 +8,7 @@
</div>
<div class="field">
<div class="field-label">Released</div>
Jul 17, 2020
Jul 19, 2020
</div>
<div class="field">
<div class="field-label">License</div>
......
......@@ -9,7 +9,7 @@ import extraElementUI from './element-ui'
import 'font-awesome/css/font-awesome.css'
import './websocket'
console.log('[DMX] 2020/07/17')
console.log('[DMX] 2020/07/19')
// 1) Init dm5 library
// The dm5 library must be inited *before* the dm5-webclient component is instantiated.
......
......@@ -69,7 +69,6 @@
<org.apache.felix.https.keystore.password></org.apache.felix.https.keystore.password>
<org.apache.felix.https.keystore.key.password></org.apache.felix.https.keystore.key.password>
<!-- WebSockets -->
<dmx.websockets.port>8081</dmx.websockets.port>
<dmx.websockets.url>ws://localhost:8080/websocket</dmx.websockets.url>
<!-- Request Filter -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment