[caldav] add oauth

bundles/binding/org.openhab.binding.caldav-personal/src/main/java/org/openhab/binding/caldav_personal/internal/CalDavBinding.java

@@ -235,6 +235,7 @@ private CalDavQuery getQueryForConfig(CalDavConfig config) {
         query.setFilterCategory(config.getFilterCategory());
         return query;
     }
+
     private synchronized void updateItem(String itemName, CalDavConfig config, List<CalDavEvent> events) {
         if (config.getType() == Type.PRESENCE) {
             List<CalDavEvent> subList = getActiveEvents(events);
@@ -290,6 +291,10 @@ private synchronized void updateItem(String itemName, CalDavConfig config, List<
                     String startEnd2 = DF.print(event.getStart()) + " - " + DF.print(event.getEnd());
                     String name = event.getName();
                     command = new StringType(name + " @ " + startEnd2);
+                    break;
+                case CALENDAR:
+                    command = new StringType(event.getCalendarId());
+                    break;
             }
 
             logger.debug("sending command {} for item {}", command, itemName);

bundles/binding/org.openhab.binding.caldav-personal/src/main/java/org/openhab/binding/caldav_personal/internal/CalDavBindingProviderImpl.java

@@ -43,13 +43,13 @@
 public class CalDavBindingProviderImpl extends AbstractGenericBindingProvider implements CalDavBindingProvider {
     private static final Logger logger = LoggerFactory.getLogger(CalDavBindingProviderImpl.class);
 
-    private static final String REGEX_CALENDAR = "calendar:'?([A-Za-z-_]+(, ?[A-Za-z-_]+)*)'?";
+    private static final String REGEX_CALENDAR = "calendar:'?([A-Za-z0-9-_]+(, ?[A-Za-z0-9-_]+)*)'?";
     private static final String REGEX_TYPE = "type:'?([A-Za-z]+)'?";
-    private static final String REGEX_EVENT_NR = "eventNr:'?([0-9]+)'?"; 
+    private static final String REGEX_EVENT_NR = "eventNr:'?([0-9]+)'?";
     private static final String REGEX_VALUE = "value:'?([A-Za-z]+)'?";
-    private static final String REGEX_FILTER_NAME = "filter-name:'?([A-Za-z\\.\\*\\+\\- \\|]+)'?";
+    private static final String REGEX_FILTER_NAME = "filter-name:'?([\\p{L}\\.\\*\\+\\- \\|]+)'?";
     private static final String REGEX_FILTER_CATEGORY = "filter-category:'?([A-Za-z-_]+(, ?[A-Za-z-_]+)*)'?";
-    
+
     /**
      * {@inheritDoc}
      */
@@ -93,7 +93,7 @@ public void processBindingConfiguration(String context, Item item, String bindin
                 calendar.add(str.trim());
             }
         }
-        
+
         String type = CalDavBindingProviderImpl.getConfigValue(bindingConfig, REGEX_TYPE);
         Type typeEnum = null;
         String eventNr = CalDavBindingProviderImpl.getConfigValue(bindingConfig, REGEX_EVENT_NR);
@@ -107,8 +107,8 @@ public void processBindingConfiguration(String context, Item item, String bindin
                 filterCategory.add(str.trim());
             }
         }
-        
-        logger.trace("found values: calendar={}, type={}, eventNr={}, value={}, filterName={}, filterCategory={}", 
+
+        logger.trace("found values: calendar={}, type={}, eventNr={}, value={}, filterName={}, filterCategory={}",
                 calendar, type, eventNr, value, filterName, filterCategory);
 
         if (calendar == null || calendar.size() == 0) {
@@ -149,11 +149,10 @@ public void processBindingConfiguration(String context, Item item, String bindin
         }
 
         logger.debug("adding item: {}", item.getName());
-        this.addBindingConfig(item, new CalDavConfig(
-                calendar, typeEnum, NumberUtils.toInt(eventNr == null ? "0" : eventNr), valueEnum, filterName, filterCategory)
-        );
+        this.addBindingConfig(item, new CalDavConfig(calendar, typeEnum,
+                NumberUtils.toInt(eventNr == null ? "0" : eventNr), valueEnum, filterName, filterCategory));
     }
-    
+
     public static String getConfigValue(String input, String regex) {
         Matcher matcher = Pattern.compile(regex).matcher(input);
         if (matcher.find()) {

bundles/binding/org.openhab.binding.caldav-personal/src/main/java/org/openhab/binding/caldav_personal/internal/CalDavConfig.java

@@ -9,10 +9,8 @@
 package org.openhab.binding.caldav_personal.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.openhab.core.binding.BindingConfig;
 
 /**
@@ -37,7 +35,8 @@ public static enum Value {
         START,
         END,
         TIME,
-        NAMEANDTIME
+        NAMEANDTIME,
+        CALENDAR
     }
 
     private final List<String> calendar;
@@ -46,9 +45,9 @@ public static enum Value {
     private final Value value;
     private final String filterName;
     private final List<String> filterCategory = new ArrayList<String>();
-    
-    public CalDavConfig(List<String> calendar, Type type, int eventNr,
-            Value value, String filterName, List<String> filterCategory) {
+
+    public CalDavConfig(List<String> calendar, Type type, int eventNr, Value value, String filterName,
+            List<String> filterCategory) {
         this.calendar = calendar;
         this.type = type;
         this.eventNr = eventNr;
@@ -76,77 +75,82 @@ public Value getValue() {
     public String getFilterName() {
         return filterName;
     }
-    
+
     public List<String> getFilterCategory() {
         return filterCategory;
     }
 
     @Override
     public String toString() {
-        return "CalDavPresenceConfig [calendar=" + calendar + ", type=" + type
-                + ", eventNr=" + eventNr + ", value=" + value + ", filterName=" + filterName + "]";
+        return "CalDavPresenceConfig [calendar=" + calendar + ", type=" + type + ", eventNr=" + eventNr + ", value="
+                + value + ", filterName=" + filterName + "]";
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result
-                + ((calendar == null) ? 0 : calendar.hashCode());
+        result = prime * result + ((calendar == null) ? 0 : calendar.hashCode());
         result = prime * result + eventNr;
-        result = prime * result
-                + ((filterCategory == null) ? 0 : filterCategory.hashCode());
-        result = prime * result
-                + ((filterName == null) ? 0 : filterName.hashCode());
+        result = prime * result + ((filterCategory == null) ? 0 : filterCategory.hashCode());
+        result = prime * result + ((filterName == null) ? 0 : filterName.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
         result = prime * result + ((value == null) ? 0 : value.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         CalDavConfig other = (CalDavConfig) obj;
         if (calendar == null) {
-            if (other.calendar != null)
+            if (other.calendar != null) {
                 return false;
-        } else if (!calendar.equals(other.calendar))
+            }
+        } else if (!calendar.equals(other.calendar)) {
             return false;
-        if (eventNr != other.eventNr)
+        }
+        if (eventNr != other.eventNr) {
             return false;
+        }
         if (filterCategory == null) {
-            if (other.filterCategory != null)
+            if (other.filterCategory != null) {
                 return false;
-        } else if (!filterCategory.equals(other.filterCategory))
+            }
+        } else if (!filterCategory.equals(other.filterCategory)) {
             return false;
+        }
         if (filterName == null) {
-            if (other.filterName != null)
+            if (other.filterName != null) {
                 return false;
-        } else if (!filterName.equals(other.filterName))
+            }
+        } else if (!filterName.equals(other.filterName)) {
             return false;
-        if (type != other.type)
+        }
+        if (type != other.type) {
             return false;
-        if (value != other.value)
+        }
+        if (value != other.value) {
             return false;
+        }
         return true;
     }
 
     public int getUniqueEventListKey() {
         final int prime = 31;
         int result = 1;
-        result = prime * result
-                + ((calendar == null) ? 0 : calendar.hashCode());
-        result = prime * result
-                + ((filterCategory == null) ? 0 : filterCategory.hashCode());
-        result = prime * result
-                + ((filterName == null) ? 0 : filterName.hashCode());
+        result = prime * result + ((calendar == null) ? 0 : calendar.hashCode());
+        result = prime * result + ((filterCategory == null) ? 0 : filterCategory.hashCode());
+        result = prime * result + ((filterName == null) ? 0 : filterName.hashCode());
         return result;
     }
-
-
+
 }

bundles/binding/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/config/DmxItem.java

@@ -69,7 +69,7 @@ public abstract class DmxItem implements BindingConfig, DmxStatusUpdateListener
 
     /**
      * Create new item based on the provided configuration string.
-     * 
+     *
      * @param itemName
      *            name for the item
      * @param configString
@@ -85,15 +85,15 @@ public DmxItem(String itemName, String configString, DmxBindingProvider dmxBindi
         name = itemName;
         bindingProvider = dmxBindingProvider;
 
-        Matcher configMatcher = DMX_CONFIG_PATTERN.matcher(configString.trim());
+        Matcher configMatcher = DMX_CONFIG_PATTERN.matcher(configString.replaceAll("(\\s)+", ""));
         if (!configMatcher.matches()) {
             throw new BindingConfigParseException(
                     "DMX Configuration must match pattern: " + configMatcher.pattern().toString());
         }
 
         try {
 
-            Matcher cmdMatcher = DMX_CMD_PATTERN.matcher(configString.trim());
+            Matcher cmdMatcher = DMX_CMD_PATTERN.matcher(configString.replaceAll("(\\s)+", ""));
             while (cmdMatcher.find()) {
 
                 String cmdString = cmdMatcher.group();
@@ -133,7 +133,7 @@ public DmxItem(String itemName, String configString, DmxBindingProvider dmxBindi
 
     /**
      * Extract channel id information from channel configuration string.
-     * 
+     *
      * @param channelString
      *            string to parse
      * @throws BindingConfigParseException
@@ -210,7 +210,7 @@ private int parseChannelNumber(String input) throws BindingConfigParseException
 
     /**
      * Try to execute the provided openHAB command.
-     * 
+     *
      * @param service
      *            DMXservice.
      * @param command
@@ -220,14 +220,14 @@ private int parseChannelNumber(String input) throws BindingConfigParseException
 
     /**
      * Check if the current item wants to be notified of state changes.
-     * 
+     *
      * @return true if status updates are needed.
      */
     public abstract boolean isStatusListener();
 
     /**
      * Check if an openHAB command has been overridden by a DMX command.
-     * 
+     *
      * @param cmd
      *            to check
      * @return true if there is a DMX command available instead.
@@ -239,7 +239,7 @@ protected final boolean isRedefinedByCustomCommand(Command cmd) {
     /**
      * Publish the new state to the event bus, if it was changed since the last
      * known value.
-     * 
+     *
      * @param state
      *            new state.
      */
@@ -305,7 +305,7 @@ public long getLastUpdateTime() {
 
     /**
      * Get the channel for the specified index.
-     * 
+     *
      * @param index
      * @return channel number
      */

bundles/binding/org.openhab.binding.dsmr/ESH-INF/binding/binding.xml

@@ -8,6 +8,8 @@
     <description>The DSMR Binding obtains data from a Dutch smart meter ("Slimme meter" in Dutch) via the P1-port.</description>
     <author>Marcel Volaart</author>
 
+    <service-id>org.openhab.dsmr</service-id>
+
     <config-description>
         <parameter name="port" type="text" required="true">
             <label>Serial port</label>

bundles/binding/org.openhab.binding.ecobee/ESH-INF/binding/binding.xml

@@ -8,6 +8,8 @@
     <description>Monitor and control Ecobee thermostats and their remote sensors using the cloud-based API.</description>
     <author>John Cocula</author>
 
+    <service-id>org.openhab.ecobee</service-id>
+
     <config-description>
         <parameter name="appkey" type="text" required="true">
             <label>API Key</label>

bundles/binding/org.openhab.binding.ecotouch/ESH-INF/binding/binding.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<binding:binding id="ecotouch"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
+        xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
+
+    <name>Waterkotte EcoTouch Binding</name>
+    <description>This is the binding for the Waterkotte EcoTouch heatpump.</description>
+    <author>Sebastian Held</author>
+    <service-id>org.openhab.ecotouch</service-id>
+
+    <config-description>
+        <parameter name="refresh" type="integer">
+            <label>Refresh interval (ms)</label>
+            <description>Data refresh interval in ms.</description>
+            <default>60000</default>
+        </parameter>
+        <parameter name="ip" type="text">
+            <label>IP address</label>
+            <description>The IP address of the Waterkotte EcoTouch display unit.</description>
+            <default></default>
+        </parameter>
+        <parameter name="username" type="text">
+            <label>Username</label>
+            <description>Username of the display unit.</description>
+            <default>admin</default>
+        </parameter>
+        <parameter name="password" type="text">
+            <label>Password</label>
+            <description>Password of the display unit.</description>
+            <default>wtkadmin</default>
+            <context>password</context>
+        </parameter>
+    </config-description>
+
+</binding:binding>

bundles/binding/org.openhab.binding.ecotouch/build.properties

@@ -2,5 +2,6 @@ source.. = src/main/java/,\
            src/main/resources/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/
+               OSGI-INF/,\
+               ESH-INF/
 output.. = target/classes/