Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[harmonyhub] Websocket implementation #4926

Merged
merged 8 commits into from
Feb 18, 2019
Merged

[harmonyhub] Websocket implementation #4926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
863c4b7
Changed to usign new websocket based library
digitaldan Dec 27, 2018
4823aa7
Updating client lib, small changes to stability and timouts
digitaldan Dec 27, 2018
a8f4246
update current activity when connected, update to latest client lib, …
digitaldan Dec 31, 2018
56d416d
Adding update jar
digitaldan Feb 9, 2019
db61cab
Merge remote-tracking branch 'origin' into harmony-websocket
digitaldan Feb 18, 2019
2b11d1f
Update to latest client, fix merge issue
digitaldan Feb 18, 2019
001dbdd
Removed dead/commented code, reduced log level, cleanup classpath fil…
digitaldan Feb 18, 2019
412b33c
Remove empty line before closing brace
wborn Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions addons/binding/org.openhab.binding.harmonyhub/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="lib" path="lib/jackson-annotations-2.8.0.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.8.7.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.8.7.jar"/>
<classpathentry kind="lib" path="lib/jxmpp-core-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/jxmpp-jid-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/jxmpp-util-cache-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/smack-core-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/smack-java7-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/smack-resolver-javax-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/smack-sasl-javax-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/smack-tcp-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/harmony-java-client-1.2.2.jar"/>
<classpathentry kind="lib" path="lib/harmony-client-1.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
4 changes: 2 additions & 2 deletions addons/binding/org.openhab.binding.harmonyhub/ESH-INF/thing/thing-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<description>Host or IP address of hub.</description>
<context>network-address</context>
</parameter>
<parameter name="heartBeatInterval" type="integer" required="false">
<parameter name="heartBeatInterval" type="integer" required="false" min="1" max="50">
<label>Heart Beat Interval</label>
<default>60</default>
<default>30</default>
<description>Heartbeat keep alive time in seconds.
</description>
</parameter>
Expand Down
31 changes: 15 additions & 16 deletions addons/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,32 @@ Automatic-Module-Name: org.openhab.binding.harmonyhub
Bundle-ActivationPolicy: lazy
Bundle-ClassPath:
.,
lib/harmony-java-client-1.2.2.jar,
lib/jackson-annotations-2.8.0.jar,
lib/jackson-core-2.8.7.jar,
lib/jackson-databind-2.8.7.jar,
lib/jxmpp-core-0.5.0.jar,
lib/jxmpp-jid-0.5.0.jar,
lib/jxmpp-util-cache-0.5.0.jar,
lib/smack-core-4.2.0.jar,
lib/smack-java7-4.2.0.jar,
lib/smack-resolver-javax-4.2.0.jar,
lib/smack-sasl-javax-4.2.0.jar,
lib/smack-tcp-4.2.0.jar,
lib/xpp3-1.1.4c.jar
lib/harmony-client-1.0.jar
Bundle-ManifestVersion: 2
Bundle-Name: HarmonyHub Binding
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-SymbolicName: org.openhab.binding.harmonyhub;singleton:=true
Bundle-Vendor: openHAB
Bundle-Version: 2.5.0.qualifier
Import-Package:
com.google.common.base,
com.google.common.collect,
com.google.common.io,
com.google.gson,
com.google.gson.annotations,
com.google.inject,
javax.inject,
org.apache.commons.lang,
org.eclipse.jdt.annotation;resolution:=optional,
org.eclipse.jetty.client,
org.eclipse.jetty.client.api,
org.eclipse.jetty.client.util,
org.eclipse.jetty.http,
org.eclipse.jetty.io,
org.eclipse.jetty.server.session,
org.eclipse.jetty.util.component,
org.eclipse.jetty.util.ssl,
org.eclipse.jetty.websocket.api,
org.eclipse.jetty.websocket.client,
org.eclipse.jetty.websocket.common,
org.eclipse.jetty.websocket.common.scopes,
org.eclipse.smarthome.config.core,
org.eclipse.smarthome.config.discovery,
org.eclipse.smarthome.core.cache,
Expand Down
28 changes: 4 additions & 24 deletions addons/binding/org.openhab.binding.harmonyhub/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,7 @@ https://github.com/openhab/openhab2-addons

== Third-party Content

harmony-java-client
* License: EPL 1.0 License
* Project: https://github.com/tuck182/harmony-java-client
* Source: https://github.com/tuck182/harmony-java-client

jackson
* License: Apache 2.0 License
* Project: https://github.com/FasterXML/jackson
* Source: https://github.com/FasterXML/jackson

jxmpp
* License: Apache 2.0 License
* Project: https://github.com/igniterealtime/jxmpp
* Source: https://github.com/igniterealtime/jxmpp

smack
* License: Apache 2.0 License
* Project: https://www.igniterealtime.org/projects/smack/
* Source: https://github.com/igniterealtime/Smack

xpp3
* License: Apache 2.0 License
* Project: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1
* Source: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1
harmony-client
* License: EPL 2.0 License
* Project: https://github.com/digitaldan/harmony-client
* Source: https://github.com/digitaldan/harmony-client
15 changes: 1 addition & 14 deletions addons/binding/org.openhab.binding.harmonyhub/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,5 @@ bin.includes = META-INF/,\
.,\
OSGI-INF/,\
ESH-INF/,\
lib/harmony-java-client-1.2.2.jar,\
lib/jackson-annotations-2.8.0.jar,\
lib/jackson-core-2.8.7.jar,\
lib/jackson-databind-2.8.7.jar,\
lib/jxmpp-core-0.5.0.jar,\
lib/jxmpp-jid-0.5.0.jar,\
lib/jxmpp-util-cache-0.5.0.jar,\
lib/smack-core-4.2.0.jar,\
lib/smack-java7-4.2.0.jar,\
lib/smack-resolver-javax-4.2.0.jar,\
lib/smack-sasl-javax-4.2.0.jar,\
lib/smack-tcp-4.2.0.jar,\
lib/xpp3-1.1.4c.jar,\
NOTICE
lib/harmony-client-1.0.jar

Binary file added addons/binding/org.openhab.binding.harmonyhub/lib/harmony-client-1.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/harmony-java-client-1.2.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jackson-annotations-2.8.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jackson-core-2.8.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jackson-databind-2.8.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jxmpp-core-0.5.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jxmpp-jid-0.5.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/jxmpp-util-cache-0.5.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/smack-core-4.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/smack-java7-4.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/smack-resolver-javax-4.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/smack-sasl-javax-4.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/smack-tcp-4.2.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed addons/binding/org.openhab.binding.harmonyhub/lib/xpp3-1.1.4c.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...java/org/openhab/binding/harmonyhub/internal/discovery/HarmonyDeviceDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import net.whistlingfish.harmony.config.Device;
import net.whistlingfish.harmony.config.HarmonyConfig;
import com.digitaldan.harmony.config.Device;
import com.digitaldan.harmony.config.HarmonyConfig;

/**
* The {@link HarmonyDeviceDiscoveryService} class discovers Harmony Devices connected to a Harmony Hub
Expand Down
8 changes: 4 additions & 4 deletions ...b/src/main/java/org/openhab/binding/harmonyhub/internal/handler/HarmonyDeviceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import net.whistlingfish.harmony.config.ControlGroup;
import net.whistlingfish.harmony.config.Device;
import net.whistlingfish.harmony.config.Function;
import net.whistlingfish.harmony.config.HarmonyConfig;
import com.digitaldan.harmony.config.ControlGroup;
import com.digitaldan.harmony.config.Device;
import com.digitaldan.harmony.config.Function;
import com.digitaldan.harmony.config.HarmonyConfig;

/**
* The {@link HarmonyDeviceHandler} is responsible for handling commands for Harmony Devices, which are
Expand Down
Loading