Skip to content

Instantly share code, notes, and snippets.

@tpett
Last active September 11, 2016 19:53
Show Gist options
  • Save tpett/f55d42b7d7f48afeaeb68a0a1416c6c7 to your computer and use it in GitHub Desktop.
Save tpett/f55d42b7d7f48afeaeb68a0a1416c6c7 to your computer and use it in GitHub Desktop.
insteonplm diff v1.8.3..d439425 (master as of today) (filtering irrelevant commit)
diff --git bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
index 57eef29..ba86ede 100644
--- bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
+++ bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Import-Package: gnu.io,
org.apache.http.client,
org.apache.http.client.methods,
org.apache.http.impl.client,
- org.apache.http.params;version="4.1.4",
+ org.apache.http.params,
org.apache.http.util,
org.openhab.core.autoupdate,
org.openhab.core.binding,
@@ -35,5 +35,5 @@ Export-Package: org.openhab.binding.insteonplm
Bundle-DocURL: http://www.openhab.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/activebinding.xml, OSGI-INF/genericbindingprovider.xml
-Bundle-ClassPath: .
-Require-Bundle: org.apache.httpcomponents.httpcore
+Bundle-ClassPath: lib/httpcore-4.1.4.jar,
+ .
diff --git bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
index 25a45b4..900b1db 100644
--- bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
+++ bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2016, openHAB.org and others.
+ Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
index 3413aa1..1e1de40 100644
--- bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
+++ bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2016, openHAB.org and others.
+ Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/build.properties bundles/binding/org.openhab.binding.insteonplm/build.properties
index 30f33af..e04f5ae 100644
--- bundles/binding/org.openhab.binding.insteonplm/build.properties
+++ bundles/binding/org.openhab.binding.insteonplm/build.properties
@@ -2,5 +2,6 @@ source.. = src/main/java/,\
src/main/resources/
bin.includes = META-INF/,\
.,\
- OSGI-INF/
+ OSGI-INF/,\
+ lib/httpcore-4.1.4.jar
output.. = target/classes/
diff --git bundles/binding/org.openhab.binding.insteonplm/lib/httpcore-4.1.4.jar bundles/binding/org.openhab.binding.insteonplm/lib/httpcore-4.1.4.jar
new file mode 100644
index 0000000..1606a2e
Binary files /dev/null and bundles/binding/org.openhab.binding.insteonplm/lib/httpcore-4.1.4.jar differ
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
index f79bd51..064fd03 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
index 2af78ea..be09bba 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -56,14 +56,14 @@ import org.slf4j.LoggerFactory;
* 1) The entries of the link database of the modem are not reliable. The category/subcategory entries in
* particular have junk data. Forget about using the modem database to generate a list of devices.
* The database should only be used to verify that a device has been linked.
- *
+ *
* 2) Querying devices for their product information does not work either. First of all, battery operated devices
* (and there are a lot of those) have their radio switched off, and may generally not respond to product
* queries. Even main stream hardwired devices sold presently (like the 2477s switch and the 2477d dimmer)
* don't even have a product ID. Although supposedly part of the Insteon protocol, we have yet to
* encounter a device that would cough up a product id when queried, even among very recent devices. They
* simply return zeros as product id. Lesson: forget about querying devices to generate a device list.
- *
+ *
* 3) Polling is a thorny issue: too much traffic on the network, and messages will be dropped left and right,
* and not just the poll related ones, but others as well. In particular sending back-to-back messages
* seemed to result in the second message simply never getting sent, without flow control back pressure
@@ -74,12 +74,12 @@ import org.slf4j.LoggerFactory;
* messages are received) leads to complicated state management because there is no guarantee at what
* point (if at all) the binding configuration will be available. It gets even more difficult when
* items are created, destroyed, and modified while the binding runs.
- *
+ *
* For the above reasons, devices are only instantiated when they are referenced by binding information.
* As nice as it would be to discover devices and their properties dynamically, we have abandoned that
* path because it had led to a complicated and fragile system which due to the technical limitations
* above was inherently squirrely.
- *
+ *
*
* @author Bernd Pfrommer
* @author Daniel Pfrommer
@@ -203,7 +203,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
* Inherited from AbstractActiveBinding.
* This method is called by the framework whenever there are changes to
* a binding configuration.
- *
+ *
* @param provider the binding provider where the binding has changed
* @param itemName the item name for which the binding has changed
*/
@@ -227,6 +227,14 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
}
}
+ protected void addBindingProvider(InsteonPLMBindingProvider bindingProvider) {
+ super.addBindingProvider(bindingProvider);
+ }
+
+ protected void removeBindingProvider(InsteonPLMBindingProvider bindingProvider) {
+ super.removeBindingProvider(bindingProvider);
+ }
+
/**
* Inherited from the ManagedService interface. This method is called whenever the configuration
* is updated. This could be signaling that e.g. the port has changed etc.
@@ -314,7 +322,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Method to find a device by address
- *
+ *
* @param aAddr the insteon address to search for
* @return reference to the device, or null if not found
*/
@@ -396,7 +404,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Send command to insteon device
- *
+ *
* @param c item binding configuration
* @param command The command to be sent
*/
@@ -412,7 +420,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Finds the device that a particular item was bound to, and removes the
* item as a listener
- *
+ *
* @param aItem The item (FeatureListener) to remove from all devices
*/
private void removeFeatureListener(String aItem) {
@@ -435,7 +443,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Creates a new insteon device for a given product key
- *
+ *
* @param aConfig The binding configuration parameters, needed to make device.
* @return Reference to the new device that has been created
*/
@@ -468,7 +476,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Checks if a device is in the modem link database, and, if the database
* is complete, logs a warning if the device is not present
- *
+ *
* @param dev The device to search for in the modem database
* @return number of devices in modem database
*/
@@ -492,7 +500,7 @@ public class InsteonPLMActiveBinding extends AbstractActiveBinding<InsteonPLMBin
/**
* Adds a feature listener (i.e. item to a feature of a device)
- *
+ *
* @param aDev The device to add the feature listener
* @param aItemName The name of the item (needed for logging and later lookups)
* @param aConfig The binding configuration for the item
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
index 56c8afc..d8fd276 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
index 96636f2..85df776 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
index e475043..fa965ac 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
index ce66f67..a10fe12 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
index 217c357..798474e 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
index 2ab16b6..21fac26 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
index d8d647b..8b98afd 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
index 94e234b..b16d774 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
index 31837c2..a020305 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
index 1ac1dff..7c357f5 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
index 5ec8f2a..0e4a5d2 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
index aeadb00..feffc3a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
index b26ac18..7d14c3e 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
index 9e2e1dc..4d0ba8f 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
index 510316e..6b4bcd7 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
index 390b40d..ed6cfb2 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
index e12880e..6d69292 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
index 82ce4d0..db68068 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
index deda0bb..85b83b8 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
index 5848f37..2c42d4a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
index c8ac5e0..1425fbb 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
index fc8b9fb..6af1818 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
index 47101eb..44626a2 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -13,7 +13,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.openhab.binding.insteonplm.internal.driver.hub.HubIOStream;
-import org.openhab.binding.insteonplm.internal.driver.hub.OldHubIOStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +32,7 @@ public abstract class IOStream {
/**
* read data from iostream
- *
+ *
* @param b byte array (output)
* @param offset offset for placement into byte array
* @param readSize size to read
@@ -60,7 +59,7 @@ public abstract class IOStream {
/**
* Write data to iostream
- *
+ *
* @param b byte array to write
*/
public void write(byte[] b) {
@@ -81,7 +80,7 @@ public abstract class IOStream {
/**
* Opens the IOStream
- *
+ *
* @return true if open was successful, false if not
*/
public abstract boolean open();
@@ -93,7 +92,7 @@ public abstract class IOStream {
/**
* reconnects the stream
- *
+ *
* @return true if reconnect succeeded
*/
private synchronized boolean reconnect() {
@@ -103,13 +102,15 @@ public abstract class IOStream {
/**
* Creates an IOStream from an allowed config string:
- *
+ *
* /dev/ttyXYZ (serial port like e.g. usb: /dev/ttyUSB0 or alias /dev/insteon)
- *
+ *
* /hub2/user:password@myinsteonhub.mydomain.com:25105,poll_time=1000 (insteon hub2 (2014))
- *
+ *
* /hub/myinsteonhub.mydomain.com:9761
- *
+ *
+ * /tcp/serialportserver.mydomain.com:port (serial port exposed via tcp, eg. ser2net)
+ *
* @param config
* @return reference to IOStream
*/
@@ -117,8 +118,8 @@ public abstract class IOStream {
public static IOStream s_create(String config) {
if (config.startsWith("/hub2/")) {
return makeHub2014Stream(config);
- } else if (config.startsWith("/hub/")) {
- return makeOldHubStream(config);
+ } else if (config.startsWith("/hub/") || config.startsWith("/tcp/")) {
+ return makeTCPStream(config);
} else {
return new SerialIOStream(config);
}
@@ -153,12 +154,12 @@ public abstract class IOStream {
return new HubIOStream(hp.host, hp.port, pollTime, user, pass);
}
- private static OldHubIOStream makeOldHubStream(String config) {
+ private static TcpIOStream makeTCPStream(String config) {
config = config.substring(5); // Get rid of the /hub/ part
String[] parts = config.split(","); // split off options at the end, if any
String[] hostPort = parts[0].split(":");
HostPort hp = new HostPort(hostPort, 9761);
- return new OldHubIOStream(hp.host, hp.port);
+ return new TcpIOStream(hp.host, hp.port);
}
private static class HostPort {
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
index 408188b..cebd1a7 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
index 5fe0c6e..2f6d5f8 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
index 6308c9b..88f6f32 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
index 2375db7..9f5ed69 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/TcpIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/TcpIOStream.java
new file mode 100644
index 0000000..b3ed2a8
--- /dev/null
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/TcpIOStream.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2010-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.openhab.binding.insteonplm.internal.driver;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Implements IOStream for the older hubs (pre 2014).
+ * Also works for serial ports exposed via tcp, eg. ser2net
+ *
+ * @author Bernd Pfrommer
+ * @since 1.7.0
+ *
+ */
+public class TcpIOStream extends IOStream {
+ private static final Logger logger = LoggerFactory.getLogger(TcpIOStream.class);
+
+ private String m_host = null;
+ private int m_port = -1;
+ private Socket m_socket = null;
+
+ /**
+ * Constructor
+ *
+ * @param host host name of hub device
+ * @param port port to connect to
+ */
+ public TcpIOStream(String host, int port) {
+ m_host = host;
+ m_port = port;
+ }
+
+ @Override
+ public boolean open() {
+ if (m_host == null || m_port < 0) {
+ logger.error("tcp connection to hub not properly configured!");
+ return (false);
+ }
+ try {
+ m_socket = new Socket(m_host, m_port);
+ m_in = m_socket.getInputStream();
+ m_out = m_socket.getOutputStream();
+ } catch (UnknownHostException e) {
+ logger.error("unknown host name: {}", m_host, e);
+ return (false);
+ } catch (IOException e) {
+ logger.error("cannot open connection to {} port {}: ", m_host, m_port, e);
+ return (false);
+ }
+ return true;
+ }
+
+ @Override
+ public void close() {
+ try {
+ if (m_in != null) {
+ m_in.close();
+ }
+ if (m_out != null) {
+ m_out.close();
+ }
+ if (m_socket != null) {
+ m_socket.close();
+ }
+ } catch (IOException e) {
+ logger.error("failed to close streams", e);
+ }
+ }
+}
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
index 0f1a95f..cfe8335 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java
deleted file mode 100644
index 8cc734a..0000000
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2010-2016, openHAB.org and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.openhab.binding.insteonplm.internal.driver.hub;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.openhab.binding.insteonplm.internal.driver.IOStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Implements IOStream for the older hubs (pre 2014)
- *
- * @author Bernd Pfrommer
- * @since 1.7.0
- *
- */
-public class OldHubIOStream extends IOStream {
- private static final Logger logger = LoggerFactory.getLogger(OldHubIOStream.class);
-
- private String m_host = null;
- private int m_port = -1;
- private Socket m_socket = null;
-
- /**
- * Constructor
- *
- * @param host host name of hub device
- * @param port port to connect to
- */
- public OldHubIOStream(String host, int port) {
- m_host = host;
- m_port = port;
- }
-
- @Override
- public boolean open() {
- if (m_host == null || m_port < 0) {
- logger.error("tcp connection to hub not properly configured!");
- return (false);
- }
- try {
- m_socket = new Socket(m_host, m_port);
- m_in = m_socket.getInputStream();
- m_out = m_socket.getOutputStream();
- } catch (UnknownHostException e) {
- logger.error("unknown host name: {}", m_host, e);
- return (false);
- } catch (IOException e) {
- logger.error("cannot open connection to {} port {}: ", m_host, m_port, e);
- return (false);
- }
- return true;
- }
-
- @Override
- public void close() {
- try {
- if (m_in != null) {
- m_in.close();
- }
- if (m_out != null) {
- m_out.close();
- }
- if (m_socket != null) {
- m_socket.close();
- }
- } catch (IOException e) {
- logger.error("failed to close streams", e);
- }
- }
-}
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
index f09d776..b201cda 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
index b32fce4..d5b3e5c 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
index b39ca62..a3c2023 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
index 5b359fc..cdf239d 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
index 27bf87f..84b6e67 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -414,7 +414,7 @@ public class Msg {
setByte("userData13", data[12]);
setByte("userData14", data[13]);
} catch (FieldException e) {
- logger.error("got field exception for msg {}:", e);
+ logger.error("got field exception on msg {}:", e);
}
}
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
index 2ab73dc..c80f0bd 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
index 14e0ee3..e9a4ca7 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
index 1d83832..8e79eb1 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
index f6f70e7..2469b20 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
index ce19ca4..2b4df0a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
index 4796c41..5575668 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
index 285b417..5e88af4 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016, openHAB.org and others.
+ * Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/resources/device_types.xml bundles/binding/org.openhab.binding.insteonplm/src/main/resources/device_types.xml
index 2e9eec5..e70abac 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/resources/device_types.xml
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/resources/device_types.xml
@@ -432,4 +432,12 @@ Example entry:
<feature name="fastonoff">FastOnOff</feature>
<feature name="lastheardfrom">GenericLastTime</feature>
</device>
+
+ <device productKey="F00.00.1F">
+ <model>2477SA1</model>
+ <description>220V 30-amp Load Controller N/O</description>
+ <feature name="switch">GenericSwitch</feature>
+ <feature name="fastonoff">FastOnOff</feature>
+ <feature name="lastheardfrom">GenericLastTime</feature>
+ </device>
</xml>
diff --git bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
index 9503938..57eef29 100644
--- bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
+++ bundles/binding/org.openhab.binding.insteonplm/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
Bundle-Name: openHAB Insteon PLM Binding
Bundle-SymbolicName: org.openhab.binding.insteonplm
Bundle-Vendor: openHAB.org
-Bundle-Version: 1.8.3
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.openhab.binding.insteonplm.InsteonPLMActivator
Bundle-ManifestVersion: 2
Bundle-Description: This is the Insteon PLM binding of the open Home Automation Bus (openHAB)
@@ -33,7 +33,7 @@ Import-Package: gnu.io,
org.slf4j
Export-Package: org.openhab.binding.insteonplm
Bundle-DocURL: http://www.openhab.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/activebinding.xml, OSGI-INF/genericbindingprovider.xml
Bundle-ClassPath: .
Require-Bundle: org.apache.httpcomponents.httpcore
diff --git bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
index bc0cc77..e683a54 100644
--- bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
+++ bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/activebinding.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2016 by the respective copyright holders.
+ Copyright (c) 2010-2015, openHAB.org and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
index 1e1de40..bc746a5 100644
--- bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
+++ bundles/binding/org.openhab.binding.insteonplm/OSGI-INF/genericbindingprovider.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010-2016 by the respective copyright holders.
+ Copyright (c) 2010-2015, openHAB.org and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/pom.xml bundles/binding/org.openhab.binding.insteonplm/pom.xml
index 8699dd2..8ddcf60 100644
--- bundles/binding/org.openhab.binding.insteonplm/pom.xml
+++ bundles/binding/org.openhab.binding.insteonplm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.openhab.bundles</groupId>
<artifactId>binding</artifactId>
- <version>1.8.3</version>
+ <version>1.9.0-SNAPSHOT</version>
</parent>
<properties>
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
index 046c43e..f1d78e5 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActivator.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
index 15982d1..a5e11c1 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMActiveBinding.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
index 474a472..463a002 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingConfig.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
index 76b1a29..22134b9 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMBindingProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
index 5d555b2..8d0223d 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/InsteonPLMGenericBindingProvider.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
index a42132a..8803b6b 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/CommandHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
index a5c38e4..c6a6464 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeature.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
index 0774cce..b5d49fa 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceFeatureListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
index 81698f6..949cd5d 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
index a77ab0b..82a30d0 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/DeviceTypeLoader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
index 2a276a7..f6f6a7e 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplate.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
index 29088d0..7d98342 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/FeatureTemplateLoader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
index d47f3d5..2cf6496 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/GroupMessageStateMachine.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
index 42c5cda..ecdc87f 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/HandlerEntry.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
index acc327e..ab3c944 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
index 46e88b4..2e107e5 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/InsteonDevice.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
index 94c1c74..296407b 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageDispatcher.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
index a6298e6..f11d791 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/MessageHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
index 97fc23b..3a22721 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/ModemDBBuilder.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
index 8274b73..30ef177 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/PollHandler.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
index 54603a1..0a7d040 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/RequestQueueManager.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
index fbc03b4..f811d2c 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/device/X10.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
index ab5ec4d..87632a0 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Driver.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
index 9f8c586..1120108 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/DriverListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
index 34ff838..5942eca 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/IOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
index 15b2bac..c67cf6a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/ModemDBEntry.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
index 8ed15a5..b1821b3 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Poller.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
index 3f6bbe6..5e6dfe1 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/Port.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
index 306088d..cbba278 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/SerialIOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
index bc0b15e..7faf282 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/HubIOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java
index 49edc87..50420d1 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/OldHubIOStream.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
index 028e81d..6bd4666 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/driver/hub/ReadByteBuffer.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
index 935f176..c7c0ba3 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/DataType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
index b1cc67d..f574b3e 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Field.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
index 277c3bf..278fd6a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/FieldException.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
index 0c5ec06..5f938f8 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/Msg.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
index 5660427..342c0dd 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgDefinition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
index 7901bfd..512dc85 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
index a93aa51..6b05a9a 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgListener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
index 48cce0f..7d3a268 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/MsgType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
index aee27bd..4098a2d 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/message/XMLMessageReader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
index e173bc9..e71c701 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Pair.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
diff --git bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
index ac99b0c..7ecf1e4 100644
--- bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
+++ bundles/binding/org.openhab.binding.insteonplm/src/main/java/org/openhab/binding/insteonplm/internal/utils/Utils.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2010-2016 by the respective copyright holders.
+ * Copyright (c) 2010-2015, openHAB.org and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
git diff v1.8.3..5a845a94e02e7cf9daf7c0a40ecbdaf898190e43 bundles/binding/org.openhab.binding.insteonplm
git diff 03b62452009363556bcecb7da8e6a97cbf92ef01..master bundles/binding/org.openhab.binding.insteonplm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment