diff --git a/bundles/org.openhab.ui.basic/NOTICE b/bundles/org.openhab.ui.basic/NOTICE index 24b603f62..8ebf98c5a 100644 --- a/bundles/org.openhab.ui.basic/NOTICE +++ b/bundles/org.openhab.ui.basic/NOTICE @@ -1,6 +1,6 @@ -This content is produced and maintained by the Eclipse SmartHome project. +This content is produced and maintained by the openHAB project. -* Project home: https://openhab.org/ +* Project home: https://www.openhab.org == Declared Project Licenses @@ -10,13 +10,7 @@ https://www.eclipse.org/legal/epl-2.0/. == Source Code -https://github.com/eclipse/smarthome - -== Copyright Holders - -See the NOTICE file distributed with the source code at -https://github.com/eclipse/smarthome/blob/master/NOTICE -for detailed information regarding copyright ownership. +https://github.com/openhab/openhab-webui == Third-party Content @@ -233,4 +227,4 @@ Roboto Font Face 2.01289 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. diff --git a/bundles/org.openhab.ui.habot/NOTICE b/bundles/org.openhab.ui.habot/NOTICE index 24b603f62..8ebf98c5a 100644 --- a/bundles/org.openhab.ui.habot/NOTICE +++ b/bundles/org.openhab.ui.habot/NOTICE @@ -1,6 +1,6 @@ -This content is produced and maintained by the Eclipse SmartHome project. +This content is produced and maintained by the openHAB project. -* Project home: https://openhab.org/ +* Project home: https://www.openhab.org == Declared Project Licenses @@ -10,13 +10,7 @@ https://www.eclipse.org/legal/epl-2.0/. == Source Code -https://github.com/eclipse/smarthome - -== Copyright Holders - -See the NOTICE file distributed with the source code at -https://github.com/eclipse/smarthome/blob/master/NOTICE -for detailed information regarding copyright ownership. +https://github.com/openhab/openhab-webui == Third-party Content @@ -233,4 +227,4 @@ Roboto Font Face 2.01289 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. diff --git a/bundles/org.openhab.ui.habpanel/NOTICE b/bundles/org.openhab.ui.habpanel/NOTICE index 24b603f62..8ebf98c5a 100644 --- a/bundles/org.openhab.ui.habpanel/NOTICE +++ b/bundles/org.openhab.ui.habpanel/NOTICE @@ -1,6 +1,6 @@ -This content is produced and maintained by the Eclipse SmartHome project. +This content is produced and maintained by the openHAB project. -* Project home: https://openhab.org/ +* Project home: https://www.openhab.org == Declared Project Licenses @@ -10,13 +10,7 @@ https://www.eclipse.org/legal/epl-2.0/. == Source Code -https://github.com/eclipse/smarthome - -== Copyright Holders - -See the NOTICE file distributed with the source code at -https://github.com/eclipse/smarthome/blob/master/NOTICE -for detailed information regarding copyright ownership. +https://github.com/openhab/openhab-webui == Third-party Content @@ -233,4 +227,4 @@ Roboto Font Face 2.01289 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. diff --git a/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js b/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js index a60c64498..fbc91f511 100755 --- a/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js +++ b/bundles/org.openhab.ui.habpanel/web/app/services/openhab.service.js @@ -165,7 +165,7 @@ function registerEventSource() { if (typeof(EventSource) !== "undefined") { - var source = new EventSource('/rest/events?topics=smarthome/items/*/statechanged,smarthome/items/*/*/statechanged,smarthome/webaudio/playurl'); + var source = new EventSource('/rest/events?topics=openhab/items/*/statechanged,openhab/items/*/*/statechanged,openhab/webaudio/playurl'); liveUpdatesEnabled = true; source.onmessage = function (event) { @@ -211,7 +211,7 @@ }); } - } else if (evtdata.topic === "smarthome/webaudio/playurl") { + } else if (evtdata.topic === "openhab/webaudio/playurl") { var context, audioBuffer; try { window.AudioContext = window.AudioContext || window.webkitAudioContext; diff --git a/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-add.vue b/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-add.vue index f85f2c2b9..73ebbbef8 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-add.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-add.vue @@ -94,7 +94,7 @@ export default { this.currentlyInstalling.push(addon.id) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/addons/*/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/addons/*/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-list.vue index b2b7bbc96..626919ddb 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/addons/addons-list.vue @@ -126,7 +126,7 @@ export default { this.currentlyUninstalling.push(addon.id) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/addons/*/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/addons/*/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue index 5cc84089b..b580f111d 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue @@ -157,7 +157,7 @@ export default { }) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/items/*/added,smarthome/items/*/removed,smarthome/items/*/updated', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/items/*/added,openhab/items/*/removed,openhab/items/*/updated', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue index 5e008ae1c..025f10422 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue @@ -303,7 +303,7 @@ export default { // this.newItemParent = null }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/items/*/added,smarthome/items/*/updated,smarthome/items/*/removed', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/items/*/added,openhab/items/*/updated,openhab/items/*/removed', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue index 58c18d221..f1f8f19df 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue @@ -389,7 +389,7 @@ export default { }) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/rules/' + this.ruleId + '/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/' + this.ruleId + '/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue index 351c55cd0..d32f0e45d 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue @@ -161,7 +161,7 @@ export default { }) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/rules/*/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/*/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue index 7aac101e3..bd5c9593f 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue @@ -173,7 +173,7 @@ export default { }) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/rules/*/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/rules/*/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') switch (topicParts[3]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue index ce18eabcc..6d2e34dbd 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue @@ -171,7 +171,7 @@ export default { this.startEventSource() }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/inbox/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/inbox/*', null, (event) => { console.log(event) // const topicParts = event.topic.split('/') this.load() diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue index 4706cd567..e25b40f1d 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue @@ -499,7 +499,7 @@ export default { }, startEventSource () { if (this.eventSource) this.stopEventSource() - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/things/*/*,smarthome/links/*/*' /* + encodeURIComponent(this.thingId) */, null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/things/*/*,openhab/links/*/*' /* + encodeURIComponent(this.thingId) */, null, (event) => { // console.log(event) const topicParts = event.topic.split('/') switch (topicParts[1]) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue index 25ce02a6f..56d300e89 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue @@ -156,7 +156,7 @@ export default { }) }, startEventSource () { - this.eventSource = this.$oh.sse.connect('/rest/events?topics=smarthome/things/*/added,smarthome/things/*/removed,smarthome/things/*/updated,smarthome/things/*/status,smarthome/inbox/*', null, (event) => { + this.eventSource = this.$oh.sse.connect('/rest/events?topics=openhab/things/*/added,openhab/things/*/removed,openhab/things/*/updated,openhab/things/*/status,openhab/inbox/*', null, (event) => { console.log(event) const topicParts = event.topic.split('/') if (topicParts[2] === 'inbox') {