Final release of multiple harmony hubs and fixes for GUI.

This closes #5 and #13

README.md

@@ -1,5 +1,5 @@
 # ha-bridge
-Emulates Philips Hue api to other home automation gateways such as an Amazon Echo.  The Bridge has helpers to build devices for the gateway for the Logitech Harmony Hub, Vera, Vera Lite or Vera Edge. Alternatively the Bridge supports custom calls as well. The Bridge handles basic commands such as "On", "Off" and "brightness" commands of the hue protocol. 
+Emulates Philips Hue api to other home automation gateways such as an Amazon Echo.  The Bridge has helpers to build devices for the gateway for the Logitech Harmony Hub, Vera, Vera Lite or Vera Edge. Alternatively the Bridge supports custom calls as well. The Bridge handles basic commands such as "On", "Off" and "brightness" commands of the hue protocol. You can provide multiple harmony hubs for control.
 ## Build
 To customize and build it yourself, build a new jar with maven:  
 ```
@@ -22,8 +22,8 @@ The server defaults to running on port 8080. If you're already running a server
 The default location for the db to contain the devices as they are added is "data/devices.db". If you would like a different filename or directory, specify -Dupnp.devices.db=`<directory>/<filename> or <filename>` if it is the same directory.
 ### -Dupnp.response.port=`<port>`
 The upnp response port that will be used. The default is 50000.  
-### -Dharmony.address=`<ip address>`
-The argument for the Harmony Hub address should be given as the system does not have a way to find the address. Supply -Dharmony.address=X.Y.Z.A on the command line to provide it. If a Harmony Hub is not used, do not set it.
+### -Dharmony.address=`<ip address>` | `<{devices:[{name:ahub,ip:x.y.w.z},{name:anotherhub,ip:a.b.c.d}]}>`
+The argument for the Harmony Hub address should be given as the system does not have a way to find the address. Supply -Dharmony.address=X.Y.Z.A on the command line to provide it. If a Harmony Hub is not used, do not set it. To provide multiple harmony hubs, use the json style notation outlined above to provide the list. This argument is backwards compatible.
 ### -Dharmony.user=`<username>`
 The user name of the MyHarmony.com account for the Harmony Hub. This needs to be given if you are using the Harmony Hub Features, provide -Dharmony.user=`<username>` on the command line.
 ### -Dharmony.pwd=`<password>`

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.0.8</version>
+	<version>1.2.0</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -33,7 +33,7 @@
 		<dependency>
 		    <groupId>com.sparkjava</groupId>
 		    <artifactId>spark-core</artifactId>
-		    <version>2.2</version>
+		    <version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

src/main/java/com/bwssystems/HABridge/BridgeSettings.java

@@ -1,14 +1,17 @@
 package com.bwssystems.HABridge;
 
+import java.util.List;
+
 public class BridgeSettings {
 	private String upnpconfigaddress;
 	private String serverport;
 	private String upnpresponseport;
 	private String upnpdevicedb;
 	private String veraaddress;
-	private String harmonyaddress;
+	private IpList harmonyaddress;
 	private String harmonyuser;
 	private String harmonypwd;
+	private Integer upnpresponsedevices;
 	private boolean upnpstrict;
 	private boolean traceupnp;
 	private boolean devmode;
@@ -43,10 +46,10 @@ public class BridgeSettings {
 	public void setVeraAddress(String veraAddress) {
 		this.veraaddress = veraAddress;
 	}
-	public String getHarmonyAddress() {
+	public IpList getHarmonyAddress() {
 		return harmonyaddress;
 	}
-	public void setHarmonyAddress(String harmonyaddress) {
+	public void setHarmonyAddress(IpList harmonyaddress) {
 		this.harmonyaddress = harmonyaddress;
 	}
 	public String getHarmonyUser() {
@@ -61,6 +64,12 @@ public class BridgeSettings {
 	public void setHarmonyPwd(String harmonypwd) {
 		this.harmonypwd = harmonypwd;
 	}
+	public Integer getUpnpResponseDevices() {
+		return upnpresponsedevices;
+	}
+	public void setUpnpResponseDevices(Integer upnpresponsedevices) {
+		this.upnpresponsedevices = upnpresponsedevices;
+	}
 	public boolean isUpnpStrict() {
 		return upnpstrict;
 	}
@@ -85,7 +94,8 @@ public class BridgeSettings {
 		return true;
 	}
 	public Boolean isValidHarmony() {
-		if(this.harmonyaddress.contains(Configuration.DEFAULT_HARMONY_ADDRESS))
+		List<NamedIP> devicesList = this.harmonyaddress.getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_HARMONY_ADDRESS))
 			return false;
 		if(this.harmonypwd == null || this.harmonypwd == "")
 			return false;

src/main/java/com/bwssystems/HABridge/Configuration.java

@@ -3,8 +3,10 @@ package com.bwssystems.HABridge;
 public class Configuration {
 	public final static String DEVICE_DB_DIRECTORY = "data/device.db"; 
 	public final static String UPNP_RESPONSE_PORT = "50000";
+	public final static String UPNP_RESPONSE_DEVICES = "30";
 	public final static String DEFAULT_VERA_ADDRESS = "1.1.1.1";
 	public final static String DEFAULT_HARMONY_ADDRESS = "1.1.1.1";
+	public final static String DEFAULT_HARMONY_ADDRESS_LIST = "{devices:[{name:default,ip:1.1.1.1}]}";
 	public final static String DEFAULT_HARMONY_USER = "";
 	public final static String DEFAULT_HARMONY_PWD = "";
 	public final static String DFAULT_WEB_PORT = "8080";

src/main/java/com/bwssystems/HABridge/HABridge.java

@@ -12,7 +12,8 @@ import com.bwssystems.HABridge.devicemanagmeent.*;
 import com.bwssystems.HABridge.hue.HueMulator;
 import com.bwssystems.HABridge.upnp.UpnpListener;
 import com.bwssystems.HABridge.upnp.UpnpSettingsResource;
-import com.bwssystems.harmony.HarmonyServer;
+import com.bwssystems.harmony.HarmonyHome;
+import com.google.gson.Gson;
 
 public class HABridge {
 	
@@ -34,7 +35,7 @@ public class HABridge {
     public static void main(String[] args) {
         Logger log = LoggerFactory.getLogger(HABridge.class);
         DeviceResource theResources;
-        HarmonyServer myHarmonyServer;
+        HarmonyHome harmonyHome;
         HueMulator theHueMulator;
         UpnpSettingsResource theSettingResponder;
         UpnpListener theUpnpListener;
@@ -61,13 +62,26 @@ public class HABridge {
         bridgeSettings.setUpnpDeviceDb(System.getProperty("upnp.device.db", Configuration.DEVICE_DB_DIRECTORY));
         bridgeSettings.setUpnpResponsePort(System.getProperty("upnp.response.port", Configuration.UPNP_RESPONSE_PORT));
         bridgeSettings.setVeraAddress(System.getProperty("vera.address", Configuration.DEFAULT_VERA_ADDRESS));
-        bridgeSettings.setHarmonyAddress(System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS));
+        IpList theHarmonyList;
+
+        try {
+        	theHarmonyList = new Gson().fromJson(System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS_LIST), IpList.class);
+        } catch (Exception e) {
+        	try {
+        		theHarmonyList = new Gson().fromJson("{devices:[{name:default,ip:" + System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS) + "}]}", IpList.class);
+        	} catch (Exception et) {
+    	        log.error("Cannot parse harmony.address, Exiting with message: " + e.getMessage(), e);
+    	        return;
+        	}
+        }
+        bridgeSettings.setHarmonyAddress(theHarmonyList);
         bridgeSettings.setHarmonyUser(System.getProperty("harmony.user", Configuration.DEFAULT_HARMONY_USER));
         bridgeSettings.setHarmonyPwd(System.getProperty("harmony.pwd", Configuration.DEFAULT_HARMONY_PWD));
         bridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
         bridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
         bridgeSettings.setDevMode(Boolean.parseBoolean(System.getProperty("dev.mode", "false")));
-
+        bridgeSettings.setUpnpResponseDevices(Integer.parseInt(System.getProperty("upnp.response.devices", Configuration.UPNP_RESPONSE_DEVICES)));
+        
         // sparkjava config directive to set ip address for the web server to listen on
         // ipAddress("0.0.0.0"); // not used
         // sparkjava config directive to set port for the web server to listen on
@@ -75,16 +89,11 @@ public class HABridge {
         // sparkjava config directive to set html static file location for Jetty
         staticFileLocation("/public");
         //setup the harmony connection if available
-      	try {
-      		myHarmonyServer = HarmonyServer.setup(bridgeSettings);
-		} catch (Exception e) {
-	        log.error("Cannot get harmony client setup, Exiting with message: " + e.getMessage(), e);
-	        return;
-		}
+        harmonyHome = new HarmonyHome(bridgeSettings);
         // setup the class to handle the resource setup rest api
-        theResources = new DeviceResource(bridgeSettings, theVersion, myHarmonyServer.getMyHarmony());
+        theResources = new DeviceResource(bridgeSettings, theVersion, harmonyHome);
         // setup the class to handle the hue emulator rest api
-        theHueMulator = new HueMulator(theResources.getDeviceRepository(), myHarmonyServer.getMyHarmony());
+        theHueMulator = new HueMulator(bridgeSettings, theResources.getDeviceRepository(), harmonyHome);
         theHueMulator.setupServer();
         // setup the class to handle the upnp response rest api
         theSettingResponder = new UpnpSettingsResource(bridgeSettings);

src/main/java/com/bwssystems/HABridge/IpList.java

@@ -0,0 +1,16 @@
+package com.bwssystems.HABridge;
+
+import java.util.List;
+
+public class IpList {
+	private List<NamedIP> devices;
+
+	public List<NamedIP> getDevices() {
+		return devices;
+	}
+
+	public void setDevices(List<NamedIP> devices) {
+		this.devices = devices;
+	}
+
+}

src/main/java/com/bwssystems/HABridge/NamedIP.java

@@ -0,0 +1,25 @@
+package com.bwssystems.HABridge;
+
+public class NamedIP {
+	private String name;
+	private String ip;
+	private String port;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getIp() {
+		return ip;
+	}
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+	public String getPort() {
+		return port;
+	}
+	public void setPort(String port) {
+		this.port = port;
+	}
+}

src/main/java/com/bwssystems/HABridge/api/hue/HueApiResponse.java

@@ -14,9 +14,9 @@ public class HueApiResponse {
     private Map<String, String> groups;
     private HueConfig config;
 
-    public HueApiResponse(String name, String ipaddress, String username, String userid) {
+    public HueApiResponse(String name, String ipaddress, String devicetype, String userid) {
 		super();
-		this.setConfig(HueConfig.createConfig(name, ipaddress, username, userid));
+		this.setConfig(HueConfig.createConfig(name, ipaddress, devicetype, userid));
 		this.setGroups(new HashMap<>());
 		this.setScenes(new HashMap<>());
 	}

src/main/java/com/bwssystems/HABridge/api/hue/HueConfig.java

@@ -1,7 +1,14 @@
 package com.bwssystems.HABridge.api.hue;
 
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
 
 public class HueConfig
 {
@@ -26,10 +33,13 @@ public class HueConfig
 
 	public static HueConfig createConfig(String name, String ipaddress, String devicetype, String userid) {
 		HueConfig aConfig = new HueConfig();
+	    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+	    SimpleDateFormat dateFormatGmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+		dateFormatGmt.setTimeZone(TimeZone.getTimeZone("UTC"));
+		aConfig.setMac(HueConfig.getMacAddress(ipaddress));
 		aConfig.setApiversion("1.4.0");
 		aConfig.setPortalservices(false);
-		aConfig.setGateway("192.168.1.1");
-		aConfig.setMac("00:00:88:00:bb:ee");
+		aConfig.setGateway(ipaddress);
 		aConfig.setSwversion("01005215");
 		aConfig.setLinkbutton(false);
 		aConfig.setIpaddress(ipaddress);
@@ -38,20 +48,46 @@ public class HueConfig
 		aConfig.setNetmask("255.255.255.0");
 		aConfig.setName(name);
 		aConfig.setDhcp(true);
-		aConfig.setUtc("2014-07-17T09:27:35");
-		aConfig.setProxyaddress("0.0.0.0");
-		aConfig.setLocaltime("2014-07-17T11:27:35");
-		aConfig.setTimezone("America/Chicago");
+		aConfig.setUtc(dateFormatGmt.format(new Date()));
+		aConfig.setProxyaddress("none");
+		aConfig.setLocaltime(dateFormat.format(new Date()));
+		aConfig.setTimezone(TimeZone.getDefault().getID());
 		aConfig.setZigbeechannel("6");
 		Map<String, WhitelistEntry> awhitelist = new HashMap<>();
 		awhitelist.put(userid, WhitelistEntry.createEntry(devicetype));
 		aConfig.setWhitelist(awhitelist);
-		
 
 		return aConfig;
 	}
 
-	 
+	private static String getMacAddress(String addr)
+	{
+		InetAddress ip;
+		StringBuilder sb = new StringBuilder();
+		try {
+				
+			ip = InetAddress.getByName(addr);
+			
+			NetworkInterface network = NetworkInterface.getByInetAddress(ip);
+				
+			byte[] mac = network.getHardwareAddress();
+				
+			for (int i = 0; i < mac.length; i++) {
+				sb.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? ":" : ""));		
+			}
+				
+		} catch (UnknownHostException e) {
+			
+			sb.append("00:00:88:00:bb:ee");
+			
+		} catch (SocketException e){
+				
+			sb.append("00:00:88:00:bb:ee");
+				
+		}
+		    
+		return sb.toString();
+	}
 	public Boolean getPortalservices() {
 		return portalservices;
 	}

src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java

@@ -5,7 +5,10 @@ package com.bwssystems.HABridge.dao;
 public class DeviceDescriptor{
     private String id;
     private String name;
+    private String mapId;
+    private String mapType;
     private String deviceType;
+    private String targetDevice;
     private String offUrl;
     private String onUrl;
     private String httpVerb;
@@ -21,7 +24,23 @@ public class DeviceDescriptor{
         this.name = name;
     }
 
-    public String getDeviceType() {
+    public String getMapId() {
+		return mapId;
+	}
+
+	public void setMapId(String mapId) {
+		this.mapId = mapId;
+	}
+
+	public String getMapType() {
+		return mapType;
+	}
+
+	public void setMapType(String mapType) {
+		this.mapType = mapType;
+	}
+
+	public String getDeviceType() {
         return deviceType;
     }
 
@@ -29,7 +48,15 @@ public class DeviceDescriptor{
         this.deviceType = deviceType;
     }
 
-    public String getOffUrl() {
+    public String getTargetDevice() {
+		return targetDevice;
+	}
+
+	public void setTargetDevice(String targetDevice) {
+		this.targetDevice = targetDevice;
+	}
+
+	public String getOffUrl() {
         return offUrl;
     }
 

src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java

@@ -178,9 +178,18 @@ public class DeviceRepository {
 		       } else if (name.equals("name")) {
 			        deviceEntry.setName(reader.nextString());
 			    	log.debug("Read a Device - device json name: " + deviceEntry.getName());
+		       } else if (name.equals("mapType")) {
+			        deviceEntry.setMapType(reader.nextString());
+			    	log.debug("Read a Device - device json name: " + deviceEntry.getMapType());
+		       } else if (name.equals("mapId")) {
+			        deviceEntry.setMapId(reader.nextString());
+			    	log.debug("Read a Device - device json name: " + deviceEntry.getMapId());
 		       } else if (name.equals("deviceType")) {
 			        deviceEntry.setDeviceType(reader.nextString());
 			    	log.debug("Read a Device - device json type:" + deviceEntry.getDeviceType());
+		       } else if (name.equals("targetDevice")) {
+			        deviceEntry.setTargetDevice(reader.nextString());
+			    	log.debug("Read a Device - device json type:" + deviceEntry.getTargetDevice());
 		       } else if (name.equals("offUrl")) {
 			        deviceEntry.setOffUrl(reader.nextString());
 			    	log.debug("Read a Device - device json off URL:" + deviceEntry.getOffUrl());

src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java

@@ -20,7 +20,7 @@ import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.Version;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.DeviceRepository;
-import com.bwssystems.harmony.HarmonyHandler;
+import com.bwssystems.harmony.HarmonyHome;
 import com.bwssystems.luupRequests.Sdata;
 import com.bwssystems.vera.VeraInfo;
 import com.google.gson.Gson;
@@ -35,14 +35,13 @@ public class DeviceResource {
     private DeviceRepository deviceRepository;
     private VeraInfo veraInfo;
     private Version version;
-    private HarmonyHandler myHarmonyHandler;
+    private HarmonyHome myHarmonyHome;
     private static final Set<String> supportedVerbs = new HashSet<>(Arrays.asList("get", "put", "post"));
 
-	public DeviceResource(BridgeSettings theSettings, Version theVersion, HarmonyHandler myHarmony) {
-		super();
+	public DeviceResource(BridgeSettings theSettings, Version theVersion, HarmonyHome theHarmonyHome) {
 		this.deviceRepository = new DeviceRepository(theSettings.getUpnpDeviceDb());
 		this.veraInfo = new VeraInfo(theSettings.getVeraAddress(), theSettings.isValidVera());
-		this.myHarmonyHandler = myHarmony;
+		this.myHarmonyHome = theHarmonyHome;
 		this.version = theVersion;
         setupEndpoints();
 	}
@@ -107,6 +106,9 @@ public class DeviceResource {
 				deviceEntry.setName(device.getName());
 				if (device.getDeviceType() != null)
 					deviceEntry.setDeviceType(device.getDeviceType());
+				deviceEntry.setMapId(device.getMapId());
+				deviceEntry.setMapType(device.getMapType());
+				deviceEntry.setTargetDevice(device.getTargetDevice());
 				deviceEntry.setOnUrl(device.getOnUrl());
 				deviceEntry.setOffUrl(device.getOffUrl());
 				deviceEntry.setHttpVerb(device.getHttpVerb());
@@ -141,8 +143,9 @@ public class DeviceResource {
 	    }, new JsonTransformer());
 
     	delete (API_CONTEXT + "/:id", "application/json", (request, response) -> {
-	    	log.debug("Delete a device");
-	        DeviceDescriptor deleted = deviceRepository.findOne(request.params(":id"));
+    		String anId = request.params(":id");
+	    	log.debug("Delete a device: " + anId);
+	        DeviceDescriptor deleted = deviceRepository.findOne(anId);
 	        if(deleted == null)
 				response.status(HttpStatus.SC_NOT_FOUND);
 	        else
@@ -184,32 +187,32 @@ public class DeviceResource {
 
     	get (API_CONTEXT + "/harmony/activities", "application/json", (request, response) -> {
 	    	log.debug("Get harmony activities");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
 		      	return null;	      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-	      	return myHarmonyHandler.getActivities();
+	      	return myHarmonyHome.getActivities();
 	    }, new JsonTransformer());
 
     	get (API_CONTEXT + "/harmony/show", "application/json", (request, response) -> {
 	    	log.debug("Get harmony current activity");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 	      		response.status(HttpStatus.SC_NOT_FOUND);
 	      		return null;
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-      		return myHarmonyHandler.getCurrentActivity();
+      		return myHarmonyHome.getCurrentActivities();
 	    }, new JsonTransformer());
 
     	get (API_CONTEXT + "/harmony/devices", "application/json", (request, response) -> {
 	    	log.debug("Get harmony devices");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
 		      	return null;	      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-	      	return myHarmonyHandler.getDevices();
+	      	return myHarmonyHome.getDevices();
 	    }, new JsonTransformer());
 
     }

src/main/java/com/bwssystems/HABridge/hue/HueMulator.java

@@ -1,5 +1,6 @@
 package com.bwssystems.HABridge.hue;
 
+import com.bwssystems.HABridge.BridgeSettings;
 import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.api.UserCreateRequest;
 import com.bwssystems.HABridge.api.hue.DeviceResponse;
@@ -8,6 +9,7 @@ import com.bwssystems.HABridge.api.hue.HueApiResponse;
 import com.bwssystems.HABridge.dao.*;
 import com.bwssystems.harmony.ButtonPress;
 import com.bwssystems.harmony.HarmonyHandler;
+import com.bwssystems.harmony.HarmonyHome;
 import com.bwssystems.harmony.RunActivity;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -55,17 +57,19 @@ public class HueMulator {
     private static final String HUE_CONTEXT = "/api";
 
     private DeviceRepository repository;
-    private HarmonyHandler myHarmony;
+    private HarmonyHome myHarmonyHome;
     private HttpClient httpClient;
     private ObjectMapper mapper;
+    private BridgeSettings bridgeSettings;
 
 
-    public HueMulator(DeviceRepository aDeviceRepository, HarmonyHandler theHandler){
+    public HueMulator(BridgeSettings theBridgeSettings, DeviceRepository aDeviceRepository, HarmonyHome theHarmonyHome){
         httpClient = HttpClients.createDefault();
         mapper = new ObjectMapper(); //armzilla: work around Echo incorrect content type and breaking mapping. Map manually
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         repository = aDeviceRepository;
-        myHarmony = theHandler;
+        myHarmonyHome = theHarmonyHome;
+        bridgeSettings = theBridgeSettings;
     }
 
 //	This function sets up the sparkjava rest calls for the hue api
@@ -74,6 +78,8 @@ public class HueMulator {
     	// http://ip_address:port/api/{userId}/lights  returns json objects of all lights configured
 	    get(HUE_CONTEXT + "/:userid/lights", "application/json", (request, response) -> {
 	    	String userId = request.params(":userid");
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue lights list requested: " + userId + " from " + request.ip());
 	        log.debug("hue lights list requested: " + userId + " from " + request.ip());
 	        List<DeviceDescriptor> deviceList = repository.findAll();
 	        Map<String, DeviceResponse> deviceResponseMap = new HashMap<>();
@@ -101,6 +107,8 @@ public class HueMulator {
         	String newUser = null;
         	String aDeviceType = null;
         	
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue api user create requested: " + request.body() + " from " + request.ip());
         	log.debug("hue api user create requested: " + request.body() + " from " + request.ip());
 	        
 	        if(request.body() != null && !request.body().isEmpty()) {
@@ -113,6 +121,8 @@ public class HueMulator {
     		
     		if(aDeviceType == null)
     			aDeviceType = "<not given>";
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue api user create requested for device type: " + aDeviceType + " and username: " + newUser);
     		log.debug("hue api user create requested for device type: " + aDeviceType + " and username: " + newUser);
 
 	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
@@ -156,6 +166,31 @@ public class HueMulator {
 	        return "[{\"success\":{\"username\":\"" + newUser + "\"}}]";        
         } );
 
+        // http://ip_address:port/api/config returns json objects for the config when no user is given
+	    get(HUE_CONTEXT + "/config", "application/json", (request, response) -> {
+	    	String userId = request.params(":userid");
+	        log.debug("hue api config requested: " + userId + " from " + request.ip());
+	        HueApiResponse apiResponse = new HueApiResponse("Philips hue", request.ip(), "My App", userId);
+	
+			response.type("application/json; charset=utf-8"); 
+	        response.status(HttpStatus.SC_OK);
+	        String responseString = null;
+	        responseString = "[{\"swversion\":\"" + apiResponse.getConfig().getSwversion() + "\",\"apiversion\":\"" + apiResponse.getConfig().getApiversion() + "\",\"name\":\"" + apiResponse.getConfig().getName() + "\",\"mac\":\"" + apiResponse.getConfig().getMac() + "\"}]";
+	        return  responseString;
+	    });
+
+        // http://ip_address:port/api/{userId}/config returns json objects for the config
+	    get(HUE_CONTEXT + "/:userid/config", "application/json", (request, response) -> {
+	    	String userId = request.params(":userid");
+	        log.debug("hue api config requested: " + userId + " from " + request.ip());
+	        HueApiResponse apiResponse = new HueApiResponse("Philips hue", request.ip(), "My App", userId);
+	
+			response.type("application/json; charset=utf-8"); 
+	        response.status(HttpStatus.SC_OK);
+	        return apiResponse.getConfig();
+	    }, new JsonTransformer());
+
+
         // http://ip_address:port/api/{userId} returns json objects for the full state
 	    get(HUE_CONTEXT + "/:userid", "application/json", (request, response) -> {
 	    	String userId = request.params(":userid");
@@ -216,26 +251,29 @@ public class HueMulator {
 	         */
 	    	String userId = request.params(":userid");
 	    	String lightId = request.params(":id");
-	        log.debug("hue state change requested: " + userId + " from " + request.ip() + " body: " + request.body());
-	
+	        String responseString = null;
+	        String url = null;
 	        DeviceState state = null;
+	        log.debug("hue state change requested: " + userId + " from " + request.ip() + " body: " + request.body());
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+			response.type("application/json; charset=utf-8"); 
+	        response.status(HttpStatus.SC_OK);
+	
 	        try {
 	            state = mapper.readValue(request.body(), DeviceState.class);
 	        } catch (IOException e) {
 	            log.error("Object mapper barfed on input of body.", e);
-	        	response.status(HttpStatus.SC_BAD_REQUEST);
-	            return null;
+        		responseString = "[{\"error\":{\"type\": 2, \"address\": \"/lights/" + lightId + ",\"description\": \"Object mapper barfed on input of body.\"}}]";
+    	        return responseString;
 	        }
 	
 	        DeviceDescriptor device = repository.findOne(lightId);
 	        if (device == null) {
-	        	response.status(HttpStatus.SC_NOT_FOUND);
-	            log.error("Could not find devcie: " + lightId + " for hue state change request: " + userId + " from " + request.ip() + " body: " + request.body());
-	            return null;
+	            log.error("Could not find device: " + lightId + " for hue state change request: " + userId + " from " + request.ip() + " body: " + request.body());
+        		responseString = "[{\"error\":{\"type\": 3, \"address\": \"/lights/" + lightId + ",\"description\": \"Could not find device\", \"resource\": \"/lights/" + lightId + "\"}}]";
+    	        return responseString;
 	        }
 	
-	        String responseString =null;
-	        String url = null;
 	        if (state.isOn()) {
 	            responseString = "[{\"success\":{\"/lights/" + lightId + "/state/on\":true}}";
 	            url = device.getOnUrl();
@@ -258,19 +296,32 @@ public class HueMulator {
 	        }
 	        else
 	        	responseString = responseString + "]";
-	        	
-	        
+
 	        if(device.getDeviceType().toLowerCase().contains("activity"))
 	        {
 	        	log.debug("executing activity to Harmony: " + url);
 	        	RunActivity anActivity = new Gson().fromJson(url, RunActivity.class);
-	        	myHarmony.startActivity(anActivity);
+	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+	        	if(myHarmony == null)
+	        	{
+	        		log.error("Should not get here, no harmony hub available");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no harmony hub available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        	}
+	        	else
+	        		myHarmony.startActivity(anActivity);
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("button"))
 	        {
 	        	log.debug("executing button press to Harmony: " + url);
 	        	ButtonPress aDeviceButton = new Gson().fromJson(url, ButtonPress.class);
-	        	myHarmony.pressButton(aDeviceButton);
+	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+	        	if(myHarmony == null)
+	        	{
+	        		log.error("Should not get here, no harmony hub available");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no harmony hub available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        	}
+	        	else
+	        		myHarmony.pressButton(aDeviceButton);
 	        }
 	        else
 	        {
@@ -284,15 +335,11 @@ public class HueMulator {
 					body = replaceIntensityValue(device.getContentBodyOff(), state.getBri());
 				// make call
 				if (!doHttpRequest(url, device.getHttpVerb(), device.getContentType(), body)) {
-					response.status(HttpStatus.SC_SERVICE_UNAVAILABLE);
 					log.error("Error on calling url to change device state: " + url);
-					return null;
+					responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Error on calling url to change device state\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 				}
 	        }
 	
-	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
-			response.type("application/json; charset=utf-8"); 
-	        response.status(HttpStatus.SC_OK);
 	        return responseString;
 	    });
     }

src/main/java/com/bwssystems/HABridge/upnp/UpnpListener.java

@@ -76,14 +76,7 @@ public class UpnpListener {
 				byte[] buf = new byte[1024];
 				DatagramPacket packet = new DatagramPacket(buf, buf.length);
 				upnpMulticastSocket.receive(packet);
-				String packetString = new String(packet.getData());
-				if(packetString != null && packetString.contains("M-SEARCH")) {
-					if(traceupnp)
-						log.info("Traceupnp: SSDP packet from " + packet.getAddress().getHostAddress() + ":" + packet.getPort() + ", body: " + packetString);
-					else
-						log.debug("Got SSDP packet from " + packet.getAddress().getHostAddress() + ":" + packet.getPort() + ", body: " + packetString);
-				}
-				if(isSSDPDiscovery(packetString)){
+				if(isSSDPDiscovery(packet)){
 					sendUpnpResponse(responseSocket, packet.getAddress(), packet.getPort());
 				}
 			}
@@ -97,17 +90,22 @@ public class UpnpListener {
 	}
 
 	/**
-	 * very naive ssdp discovery packet detection
-	 * @param body
-	 * @return
+	 * ssdp discovery packet detection
 	 */
-	protected boolean isSSDPDiscovery(String body){
-		// log.debug("Check if this is a MAN ssdp-discover packet for a upnp basic device: " + body);
-		//Only respond to discover request for upnp basic device from echo, the others are for the wemo
-		if(body != null && body.contains("M-SEARCH") && body.contains("\"ssdp:discover\"")){
-			if(traceupnp)
+	protected boolean isSSDPDiscovery(DatagramPacket packet){
+		//Only respond to discover request for strict upnp form
+		String packetString = new String(packet.getData());
+		if(packetString != null && packetString.startsWith("M-SEARCH * HTTP/1.1") && packetString.contains("\"ssdp:discover\"")){
+			if(traceupnp) {
+				log.info("Traceupnp: SSDP packet from " + packet.getAddress().getHostAddress() + ":" + packet.getPort() + ", body: " + packetString);
 				log.info("Traceupnp: isSSDPDiscovery found message to be an M-SEARCH message.");
-			if(strict && body.startsWith("M-SEARCH * HTTP/1.1") && body.contains("MAN: \"ssdp:discover\"") && (body.contains("ST: urn:schemas-upnp-org:device:basic:1") || body.contains("ST: upnp:rootdevice") || body.contains("ST: ssdp:all")))
+			}
+			else {
+				log.debug("Got SSDP packet from " + packet.getAddress().getHostAddress() + ":" + packet.getPort() + ", body: " + packetString);
+				log.debug("Found message to be an M-SEARCH message.");
+			}
+
+			if(strict && (packetString.contains("ST: urn:schemas-upnp-org:device:basic:1") || packetString.contains("ST: upnp:rootdevice") || packetString.contains("ST: ssdp:all")))
 			{
 				if(traceupnp)
 					log.info("Traceupnp: isSSDPDiscovery found message to be valid under strict rules - strict: " + strict);
@@ -134,7 +132,7 @@ public class UpnpListener {
 			"USN: uuid:Socket-1_0-221438K0100073::urn:schemas-upnp-org:device:basic:1\r\n\r\n";
 	protected void sendUpnpResponse(DatagramSocket socket, InetAddress requester, int sourcePort) throws IOException {
 		String discoveryResponse = null;
-		discoveryResponse = String.format(discoveryTemplate, responseAddress, httpServerPort, getRandomUUIDString());
+		discoveryResponse = String.format(discoveryTemplate, responseAddress, httpServerPort);
 		if(traceupnp)
 			log.info("Traceupnp: sendUpnpResponse: " + discoveryResponse);
 		else
@@ -142,8 +140,4 @@ public class UpnpListener {
 		DatagramPacket response = new DatagramPacket(discoveryResponse.getBytes(), discoveryResponse.length(), requester, sourcePort);
 		socket.send(response);
 	}
-
-	protected String getRandomUUIDString(){
-		return "88f6698f-2c83-4393-bd03-cd54a9f8595"; // https://xkcd.com/221/
-	}
 }

src/main/java/com/bwssystems/harmony/HarmonyActivity.java

@@ -0,0 +1,21 @@
+package com.bwssystems.harmony;
+
+import net.whistlingfish.harmony.config.Activity;
+
+public class HarmonyActivity {
+	private String hub;
+	private Activity activity;
+	public String getHub() {
+		return hub;
+	}
+	public void setHub(String hub) {
+		this.hub = hub;
+	}
+	public Activity getActivity() {
+		return activity;
+	}
+	public void setActivity(Activity activity) {
+		this.activity = activity;
+	}
+
+}

src/main/java/com/bwssystems/harmony/HarmonyDevice.java

@@ -0,0 +1,20 @@
+package com.bwssystems.harmony;
+
+import net.whistlingfish.harmony.config.Device;
+
+public class HarmonyDevice {
+	private Device device;
+	private String hub;
+	public Device getDevice() {
+		return device;
+	}
+	public void setDevice(Device device) {
+		this.device = device;
+	}
+	public String getHub() {
+		return hub;
+	}
+	public void setHub(String hub) {
+		this.hub = hub;
+	}
+}

src/main/java/com/bwssystems/harmony/HarmonyHome.java

@@ -0,0 +1,102 @@
+package com.bwssystems.harmony;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.NamedIP;
+
+import net.whistlingfish.harmony.config.Activity;
+import net.whistlingfish.harmony.config.Device;
+
+public class HarmonyHome {
+    private static final Logger log = LoggerFactory.getLogger(HarmonyHome.class);
+	private Map<String, HarmonyServer> hubs;
+
+	public HarmonyHome(BridgeSettings bridgeSettings) {
+		super();
+		hubs = new HashMap<String, HarmonyServer>();
+		Iterator<NamedIP> theList = bridgeSettings.getHarmonyAddress().getDevices().iterator();
+		while(theList.hasNext()) {
+			NamedIP aHub = theList.next();
+	      	try {
+	      		hubs.put(aHub.getName(), HarmonyServer.setup(bridgeSettings, aHub));
+			} catch (Exception e) {
+		        log.error("Cannot get harmony client (" + aHub.getName() + ") setup, Exiting with message: " + e.getMessage(), e);
+		        return;
+			}
+		}
+	}
+
+	public HarmonyHandler getHarmonyHandler(String aName) {
+		HarmonyHandler aHandler = null;
+		if(aName == null || aName.equals("")) {
+			aName = "default";
+		}
+
+		if(hubs.get(aName) == null) {
+			Set<String> keys = hubs.keySet();
+			if(!keys.isEmpty()) {
+				aHandler = hubs.get(keys.toArray()[0]).getMyHarmony();
+			}
+			else
+				aHandler = null;
+		}
+		else
+			aHandler = hubs.get(aName).getMyHarmony();
+		return aHandler;
+	}
+	
+	public List<HarmonyActivity> getActivities() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyActivity> activityList = new ArrayList<HarmonyActivity>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Activity> activities = hubs.get(key).getMyHarmony().getActivities().iterator();
+			while(activities.hasNext()) {
+				HarmonyActivity anActivity = new HarmonyActivity();
+				anActivity.setActivity(activities.next());
+				anActivity.setHub(key);
+				activityList.add(anActivity);
+			}
+		}
+		return activityList;
+	}
+	public List<HarmonyActivity> getCurrentActivities() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyActivity> activityList = new ArrayList<HarmonyActivity>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Activity> activities = hubs.get(key).getMyHarmony().getActivities().iterator();
+			while(activities.hasNext()) {
+				HarmonyActivity anActivity = new HarmonyActivity();
+				anActivity.setActivity(activities.next());
+				anActivity.setHub(key);
+				activityList.add(anActivity);
+			}
+		}
+		return activityList;
+	}
+	public List<HarmonyDevice> getDevices() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyDevice> deviceList = new ArrayList<HarmonyDevice>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Device> devices = hubs.get(key).getMyHarmony().getDevices().iterator();
+			while(devices.hasNext()) {
+				HarmonyDevice aDevice = new HarmonyDevice();
+				aDevice.setDevice(devices.next());
+				aDevice.setHub(key);
+				deviceList.add(aDevice);
+			}
+		}
+		return deviceList;
+	}
+}

src/main/java/com/bwssystems/harmony/HarmonyServer.java

@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.NamedIP;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
@@ -24,23 +25,25 @@ public class HarmonyServer {
     private HarmonyHandler myHarmony;
     private DevModeResponse devResponse;
     private OAReplyProvider dummyProvider;
+    private NamedIP myNameAndIP;
     
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
-	public HarmonyServer() {
+	public HarmonyServer(NamedIP theHarmonyAddress) {
 		super();
 		myHarmony = null;
 		dummyProvider = null;
+		myNameAndIP = theHarmonyAddress;
 	}
 
-	public static HarmonyServer setup(BridgeSettings bridgeSettings) throws Exception {
+	public static HarmonyServer setup(BridgeSettings bridgeSettings, NamedIP theHarmonyAddress) throws Exception {
 		if(!bridgeSettings.isValidHarmony()) {
-			return new HarmonyServer();
+			return new HarmonyServer(theHarmonyAddress);
 		}
     	Injector injector = null;
     	if(!bridgeSettings.isDevMode())
     		injector = Guice.createInjector(new HarmonyClientModule());
-        HarmonyServer mainObject = new HarmonyServer();
+        HarmonyServer mainObject = new HarmonyServer(theHarmonyAddress);
     	if(!bridgeSettings.isDevMode())
     		injector.injectMembers(mainObject);
   		mainObject.execute(bridgeSettings);
@@ -54,7 +57,7 @@ public class HarmonyServer {
         	log.debug("something is very wrong as dummyProvider is not null...");
         if(mySettings.isDevMode())
         	modeString = " (development mode)";
-        if(noopCalls)
+        else if(noopCalls)
         	modeString = " (no op calls to harmony)";
 		log.info("setup initiated " + modeString + "....");
         if(mySettings.isDevMode())
@@ -70,7 +73,7 @@ public class HarmonyServer {
 					log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
 				}
 			});
-			harmonyClient.connect(mySettings.getHarmonyAddress(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
+			harmonyClient.connect(myNameAndIP.getIp(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
         }
         myHarmony = new HarmonyHandler(harmonyClient, noopCalls, devResponse);
 	}

src/main/java/com/bwssystems/vera/VeraInfo.java

@@ -30,7 +30,7 @@ public class VeraInfo {
 
     public VeraInfo(String addressString, Boolean isValidVera) {
 		super();
-        httpClient = HttpClients.createMinimal();
+        httpClient = HttpClients.createDefault();
         veraAddressString = addressString;
         validVera = isValidVera;
 	}

src/main/resources/public/index.html

@@ -29,6 +29,7 @@
 				<ul class="nav navbar-nav">
 					<li class="active"><a href="#">Home</a></li>
 					<li><a href="http://echo.amazon.com/#cards" target="_blank">My Echo</a></li>
+					<li><a href="https://github.com/bwssytems/ha-bridge/blob/master/README.md" target="_blank">Help</a></li>
 					<li class="dropdown">
 						<a id="dropdownMenu1" href="" class="dropdown-toggle"
 						data-toggle="dropdown" role="button" aria-haspopup="true"

src/main/resources/public/scripts/app.js

@@ -4,11 +4,8 @@ var app = angular.module('habridge', [
 
 app.config(function ($routeProvider) {
 	$routeProvider.when('/#', {
-		templateUrl: 'views/nonconfiguration.html',
-		controller: 'ViewingController'
-	}).when('/show', {
 		templateUrl: 'views/configuration.html',
-		controller: 'ViewingController'		
+		controller: 'ViewingController'
 	}).when('/editor', {
 		templateUrl: 'views/editor.html',
 		controller: 'AddingController'		
@@ -28,7 +25,7 @@ app.config(function ($routeProvider) {
 		templateUrl: 'views/harmonyactivity.html',
 		controller: 'AddingController'		
 	}).otherwise({
-		templateUrl: 'views/nonconfiguration.html',
+		templateUrl: 'views/configuration.html',
 		controller: 'ViewingController'
 	})
 });
@@ -194,7 +191,7 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                 }
             );
         };
-
+        
         this.viewVeraScenes = function () {
             this.state.error = "";
         	if(!this.state.showVera)
@@ -212,7 +209,7 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                 }
             );
         };
-
+        
         this.viewHarmonyActivities = function () {
             this.state.error = "";
         	if(!this.state.showHarmony)
@@ -249,22 +246,33 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
             );
         };
 
-        this.addDevice = function (id, name, type, onUrl, offUrl, httpVerb, contentType, contentBody, contentBodyOff) {
+        this.findDeviceByMapId = function(id, target, type) {
+        	for(var i = 0; i < this.state.devices.length; i++) {
+        		if(this.state.devices[i].mapId == id && this.state.devices[i].mapType == type && this.state.devices[i].targetDevice == target)
+        			return true;
+        	}
+        	return false;
+        };
+        
+        this.addDevice = function (device) {
             this.state.error = "";
-            if(httpVerb != null && httpVerb != "")
-            	type = "custom";
-            if (id) {
-                var putUrl = this.state.base + "/" + id;
+            if(device.httpVerb != null && device.httpVerb != "")
+            	device.deviceType = "custom";
+            if (device.id) {
+                var putUrl = this.state.base + "/" + device.id;
                 return $http.put(putUrl, {
-                    id: id,
-                    name: name,
-                    deviceType: type,
-                    onUrl: onUrl,
-                    offUrl: offUrl,
-                    httpVerb: httpVerb,
-                    contentType: contentType,
-                    contentBody: contentBody,
-                    contentBodyOff: contentBodyOff
+                    id: device.id,
+                    name: device.name,
+                    mapId: device.mapId,
+                    mapType: device.mapType,
+                    deviceType: device.deviceType,
+                    targetDevice: device.targetDevice,
+                    onUrl: device.onUrl,
+                    offUrl: device.offUrl,
+                    httpVerb: device.httpVerb,
+                    contentType: device.contentType,
+                    contentBody: device.contentBody,
+                    contentBodyOff: device.contentBodyOff
                 }).then(
                     function (response) {
                         self.viewDevices();
@@ -277,19 +285,22 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                     }
                 );
             } else {
-            	if(type == null || type == "")
-            		type = "switch";
-                if(httpVerb != null && httpVerb != "")
-                	type = "custom";
+            	if(device.deviceType == null || device.deviceType == "")
+            		device.deviceType = "switch";
+                if(device.httpVerb != null && device.httpVerb != "")
+                	device.deviceType = "custom";
                 return $http.post(this.state.base, {
-                    name: name,
-                    deviceType: type,
-                    onUrl: onUrl,
-                    offUrl: offUrl,
-                    httpVerb: httpVerb,
-                    contentType: contentType,
-                    contentBody: contentBody,
-                    contentBodyOff: contentBodyOff
+                    name: device.name,
+                    mapId: device.mapId,
+                    mapType: device.mapType,
+                    deviceType: device.deviceType,
+                    targetDevice: device.targetDevice,
+                    onUrl: device.onUrl,
+                    offUrl: device.offUrl,
+                    httpVerb: device.httpVerb,
+                    contentType: device.contentType,
+                    contentBody: device.contentBody,
+                    contentBodyOff: device.contentBodyOff
                 }).then(
                     function (response) {
                         self.viewDevices();
@@ -319,8 +330,40 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
             );
         };
 
-        this.editDevice = function (id, name, onUrl, offUrl, httpVerb, contentType, contentBody, contentBodyOff) {
-            self.state.device = {id: id, name: name, onUrl: onUrl, offUrl: offUrl, httpVerb: httpVerb, contentType: contentType, contentBody: contentBody, contentBodyOff: contentBodyOff};
+        this.deleteDeviceByMapId = function (id, type) {
+        	for(var i = 0; i < this.state.devices.length; i++) {
+        		if(this.state.devices[i].mapId == id && this.state.devices[i].mapType == type)
+        			return self.deleteDevice(this.state.devices[i].id);
+        	}
+        };
+
+        this.editDevice = function (device) {
+            self.state.device = device;
+        };
+
+        this.testUrl = function (device, type) {
+        	if(type == "on") {
+       			$http.put(this.state.huebase + "/test/lights/" + device.id + "/state", "{\"on\":true}").then(
+       	                function (response) {
+       	                    $window.alert("Request Exceuted: " + response.statusText);
+       	                },
+       	                function (error) {
+       	                    $window.alert("Request Error: " + error.statusText + ", with status: " + error.status + ", Pleae look in your console log.");
+       	                }
+       	            );
+           		return;        		
+        	}
+        	else {
+       			$http.put(this.state.huebase + "/test/lights/" + device.id + "/state", "{\"on\":false}").then(
+       	                function (response) {
+       	                    $window.alert("Request Exceuted: " + response.statusText);
+       	                },
+       	                function (error) {
+       	                    $window.alert("Request Error: " + error.statusText + ", with status: " + error.status + ", Pleae look in your console log.");
+       	                }
+       	            );
+           		return;        		
+           	}
         };
     });
 
@@ -331,6 +374,8 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
         $scope.bridge = bridgeService.state;
         bridgeService.updateShowVera();
         bridgeService.updateShowHarmony();
+        $scope.visible = false;
+        $scope.imgUrl = "glyphicon glyphicon-plus";
         $scope.predicate = '';
         $scope.reverse = true;
         $scope.order = function(predicate) {
@@ -341,83 +386,26 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
             bridgeService.deleteDevice(device.id);
         };
         $scope.testUrl = function (device, type) {
-        	if(type == "on") {
-            	if(device.deviceType == "activity" || device.deviceType == "button") {
-        			$http.put($scope.bridge.huebase + "/test/lights/" + device.id + "/state", "{\"on\":true}").then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-            		return;        		
-            	}
-
-        		if(device.httpVerb == "PUT")
-        			$http.put(device.onUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else if(device.httpVerb == "POST")
-        			$http.post(device.onUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else
-        			window.open(device.onUrl, "_blank");
-        	}
-        	else {
-            	if(device.deviceType == "activity" || device.deviceType == "button") {
-        			$http.put($scope.bridge.huebase + "/test/lights/" + device.id + "/state", "{\"on\":false}").then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-            		return;        		
-            	}
-
-        		if(device.httpVerb == "PUT")
-        			$http.put(device.offUrl, device.contentBodyOff).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else if(device.httpVerb == "POST")
-        			$http.post(device.offUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else
-            		window.open(device.offUrl, "_blank");
-        	}
+        	bridgeService.testUrl(device, type);
         };
         $scope.setBridgeUrl = function (url) {
             bridgeService.state.base = url;
             bridgeService.viewDevices();
         };
+        $scope.goBridgeUrl = function (url) {
+        	window.open(url, "_blank");
+        };
         $scope.editDevice = function (device) {
-            bridgeService.editDevice(device.id, device.name, device.onUrl, device.offUrl, device.httpVerb, device.contentType, device.contentBody, device.contentBodyOff);
+            bridgeService.editDevice(device);
             $location.path('/editdevice');
         };
+        $scope.toggle = function () {
+            $scope.visible = !$scope.visible;
+            if($scope.visible)
+                $scope.imgUrl = "glyphicon glyphicon-minus";
+            else
+                $scope.imgUrl = "glyphicon glyphicon-plus";
+        };
     });
 
 app.controller('AddingController', function ($scope, $location, $http, bridgeService, BridgeSettings) {
@@ -434,6 +422,14 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
         bridgeService.updateShowVera();
         bridgeService.updateShowHarmony();
         $scope.device = bridgeService.state.device;
+        $scope.activitiesVisible = false;
+        $scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+        $scope.buttonsVisible = false;
+        $scope.imgActivitiesUrl = "glyphicon glyphicon-plus";
+        $scope.devicesVisible = false;
+        $scope.imgDevicesUrl = "glyphicon glyphicon-plus";
+        $scope.scenesVisible = false;
+        $scope.imgScenesUrl = "glyphicon glyphicon-plus";
         $scope.predicate = '';
         $scope.reverse = true;
         $scope.device_dim_control = "";
@@ -446,6 +442,9 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
             if ($scope.vera.base.indexOf("http") < 0) {
                 $scope.vera.base = "http://" + $scope.vera.base;
             }
+            $scope.device.deviceType = "switch";
+            $scope.device.mapType = "veraDevice";
+            $scope.device.mapId = $scope.vera.id;
             if(dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0)
             	$scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
                 	+ "/data_request?id=action&output_format=json&DeviceNum="
@@ -466,6 +465,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                 $scope.vera.base = "http://" + $scope.vera.base;
             }
             $scope.device.deviceType = "scene";
+            $scope.device.mapType = "veraScene";
+            $scope.device.mapId = $scope.vera.id;
             $scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
                 + "/data_request?id=action&output_format=json&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="
                 + $scope.vera.id;
@@ -480,6 +481,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
             }
             $scope.device.deviceType = "switch";
             $scope.device.name = veradevice.name;
+            $scope.device.mapType = "veraDevice";
+            $scope.device.mapId = veradevice.id;
             if(dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0)
             	$scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
                 	+ "/data_request?id=action&output_format=json&DeviceNum="
@@ -501,6 +504,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
             }
             $scope.device.deviceType = "scene";
             $scope.device.name = verascene.name;
+            $scope.device.mapType = "veraScene";
+            $scope.device.mapId = verascene.id;
             $scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
                 + "/data_request?id=action&output_format=json&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="
                 + verascene.id;
@@ -511,96 +516,38 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
 
         $scope.buildActivityUrls = function (harmonyactivity) {
             $scope.device.deviceType = "activity";
-            $scope.device.name = harmonyactivity.label;
-            $scope.device.onUrl = "{\"name\":\"" + harmonyactivity.id + "\"}";
+            $scope.device.targetDevice = harmonyactivity.hub;
+            $scope.device.name = harmonyactivity.activity.label;
+            $scope.device.mapType = "harmonyActivity";
+            $scope.device.mapId = harmonyactivity.activity.id;
+            $scope.device.onUrl = "{\"name\":\"" + harmonyactivity.activity.id + "\"}";
             $scope.device.offUrl = "{\"name\":\"-1\"}";
         };
 
         $scope.buildButtonUrls = function (harmonydevice, onbutton, offbutton) {
             $scope.device.deviceType = "button";
-            $scope.device.name = harmonydevice.label;
-            $scope.device.onUrl = "{\"device\":\"" + harmonydevice.id + "\",\"button\":\"" + onbutton + "\"}";
-            $scope.device.offUrl = "{\"device\":\"" + harmonydevice.id + "\",\"button\":\"" + offbutton + "\"}";
+            $scope.device.targetDevice = harmonydevice.hub;
+            $scope.device.name = harmonydevice.device.label;
+            $scope.device.mapType = "harmonyButton";
+            $scope.device.mapId = harmonydevice.device.id + "-" + onbutton + "-" + offbutton;
+            $scope.device.onUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}";
+            $scope.device.offUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}";
         };
 
         $scope.testUrl = function (device, type) {
-        	if(type == "on") {
-            	if(device.deviceType == "activity" || device.deviceType == "button") {
-        			$http.put($scope.bridge.huebase + "/test/lights/" + device.id + "/state", "{\"on\":true}").then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-            		return;        		
-            	}
-
-        		if(device.httpVerb == "PUT")
-        			$http.put(device.onUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else if(device.httpVerb == "POST")
-        			$http.post(device.onUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else
-        			window.open(device.onUrl, "_blank");
-        	}
-        	else {
-            	if(device.deviceType == "activity" || device.deviceType == "button") {
-        			$http.put($scope.bridge.huebase + "/test/lights/" + device.id + "/state", "{\"on\":false}").then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-            		return;        		
-            	}
-
-        		if(device.httpVerb == "PUT")
-        			$http.put(device.offUrl, device.contentBodyOff).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else if(device.httpVerb == "POST")
-        			$http.post(device.offUrl, device.contentBody).then(
-        	                function (response) {
-        	                    $window.alert("Request Exceuted: " + response.statusText);
-        	                },
-        	                function (error) {
-        	                    $window.alert("Request Error: " + error.data.message);
-        	                }
-        	            );
-        		else
-            		window.open(device.offUrl, "_blank");
-        	}
+        	bridgeService.testUrl(device, type);
         };
 
         $scope.addDevice = function () {
-            bridgeService.addDevice($scope.device.id, $scope.device.name, $scope.device.deviceType, $scope.device.onUrl, $scope.device.offUrl, $scope.device.httpVerb, $scope.device.contentType, $scope.device.contentBody, $scope.device.contentBodyOff).then(
+            bridgeService.addDevice($scope.device).then(
                 function () {
                     $scope.device.id = "";
+                    $scope.device.mapType = null;
+                    $scope.device.mapId = null;
                     $scope.device.name = "";
                     $scope.device.onUrl = "";
                     $scope.device.deviceType = "switch";
+                    $scope.device.targetDevice = null;
                     $scope.device.offUrl = "";
                     $scope.device.httpVerb = null;
                     $scope.device.contentType = null;
@@ -612,9 +559,144 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                 }
             );
         }
+
+        $scope.toggleActivities = function () {
+            $scope.activitiesVisible = !$scope.activitiesVisible;
+            if($scope.activitiesVisible)
+                $scope.imgActivitiesUrl = "glyphicon glyphicon-minus";
+            else
+                $scope.imgActivitiesUrl = "glyphicon glyphicon-plus";
+        };
+        
+        $scope.toggleButtons = function () {
+            $scope.buttonsVisible = !$scope.buttonsVisible;
+            if($scope.buttonsVisible)
+                $scope.imgButtonsUrl = "glyphicon glyphicon-minus";
+            else
+                $scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+        };
+        
+        $scope.toggleDevices = function () {
+            $scope.devicesVisible = !$scope.devicesVisible;
+            if($scope.devicesVisible)
+                $scope.imgDevicesUrl = "glyphicon glyphicon-minus";
+            else
+                $scope.imgDevicesUrl = "glyphicon glyphicon-plus";
+        };
+        
+        $scope.toggleScenes = function () {
+            $scope.scenesVisible = !$scope.scenesVisible;
+            if($scope.scenesVisible)
+                $scope.imgScenesUrl = "glyphicon glyphicon-minus";
+            else
+                $scope.imgScenesUrl = "glyphicon glyphicon-plus";
+        };
+        
+        $scope.deleteDeviceByMapId = function (id, mapType) {
+        	bridgeService.deleteDeviceByMapId(id, mapType);
+        };
         
     });
 
+app.filter('availableHarmonyActivityId', function(bridgeService) {
+        return function(input) {
+            var out = [];
+            if(input == null)
+            	return out;
+            for (var i = 0; i < input.length; i++) {
+                if(!bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){
+                    out.push(input[i]);
+                }
+            }
+            return out;
+        }
+    });
+
+app.filter('unavailableHarmonyActivityId', function(bridgeService) {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+app.filter('availableVeraDeviceId', function(bridgeService) {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(!bridgeService.findDeviceByMapId(input[i].id, "veraDevice")){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+app.filter('unavailableVeraDeviceId', function(bridgeService) {
+return function(input) {
+    var out = [];
+    if(input == null)
+    	return out;
+    for (var i = 0; i < input.length; i++) {
+        if(bridgeService.findDeviceByMapId(input[i].id, "veraDevice")){
+            out.push(input[i]);
+        }
+    }
+    return out;
+}
+});
+
+app.filter('availableVeraSceneId', function(bridgeService) {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(!bridgeService.findDeviceByMapId(input[i].id, "veraScene")){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+app.filter('unavailableVeraSceneId', function(bridgeService) {
+return function(input) {
+    var out = [];
+    if(input == null)
+    	return out;
+    for (var i = 0; i < input.length; i++) {
+        if(bridgeService.findDeviceByMapId(input[i].id, "veraScene")){
+            out.push(input[i]);
+        }
+    }
+    return out;
+}
+});
+
+app.filter('configuredButtons', function() {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(input[i].mapType == "harmonyButton"){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+
 app.controller('ErrorsController', function ($scope, bridgeService) {
         $scope.bridge = bridgeService.state;
     });

src/main/resources/public/views/configuration.html

@@ -37,6 +37,9 @@
 					<th>
 						<a href="" ng-click="order('deviceType')">Type</a>
         				<span class="sortorder" ng-show="predicate === 'deviceType'" ng-class="{reverse:reverse}"></span></th>
+					<th>
+						<a href="" ng-click="order('targetDevice')">Target</a>
+        				<span class="sortorder" ng-show="predicate === 'targetDevice'" ng-class="{reverse:reverse}"></span></th>
 					<th>Actions</th>
 				</tr>
 			</thead>
@@ -44,6 +47,7 @@
 				<td>{{device.id}}</td>
 				<td>{{device.name}}</td>
 				<td>{{device.deviceType}}</td>
+				<td>{{device.targetDevice}}</td>
 				<td>
 					<button class="btn btn-info" type="submit"
 						ng-click="testUrl(device, 'on')">Test ON</button>
@@ -60,14 +64,13 @@
 
 	<div class="panel panel-default bridgeServer">
 		<div class="panel-heading">
-  			<a href="#/"><span class="glyphicon glyphicon-minus" aria-hidden="true"></span></a>
-			<h1 class="panel-title">Bridge settings</h1>
+			<h1 class="panel-title">Bridge settings <a ng-click="toggle()"><span class={{imgUrl}} aria-hidden="true"></a></h1>
 		</div>
-		<div class="panel-body">
+		<div ng-if="visible" class="animate-if" class="panel-body">
 
 			<form class="form-horizontal">
 				<div class="form-group">
-					<label class="col-xs-12 col-sm-3 control-label" for="bridge-base">Bridge
+					<label class="col-xs-12 col-sm-2 control-label" for="bridge-base">Bridge
 						server</label>
 
 					<div class="col-xs-8 col-sm-7">
@@ -77,7 +80,7 @@
 					<button type="submit" class="col-xs-2 col-sm-1 btn btn-primary"
 						ng-click="setBridgeUrl(bridge.base)">Load</button>
 					<button type="submit" class="col-xs-2 col-sm-1 btn btn-primary"
-						ng-click="testUrl(bridge.base)">Go</button>
+						ng-click="goBridgeUrl(bridge.base)">Go</button>
 				</div>
 			</form>
 			<table class="table table-bordered table-striped table-hover">

src/main/resources/public/views/editdevice.html

@@ -10,7 +10,7 @@
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
-		<h2 class="panel-title">Add a new device</h2>
+		<h2 class="panel-title">Edit a device</h2>
 	</div>
 	<ul class="list-group">
 		<li class="list-group-item">
@@ -26,6 +26,40 @@
 					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
 						Update Device</button>
 				</div>
+				<div class="form-group">
+					<label class="col-xs-12 col-sm-2 control-label" for="device-target">Target
+					</label>
+
+					<div class="col-xs-8 col-sm-7">
+						<input type="text" class="form-control" id="device-target"
+							ng-model="device.targetDevice" placeholder="default">
+					</div>
+				</div>
+				<div class="form-group">
+					<div class="row">
+					<label class="col-xs-12 col-sm-2 control-label" for="device-map-type">Map Type
+					</label>
+
+					<div class="col-xs-8 col-sm-7">
+					    <select name="device-map-type" id="device-map-type" ng-model="device.mapType">
+					      <option value="">---Please select---</option> <!-- not selected / blank option -->
+					      <option value="veraDevice">Vera Device</option>
+					      <option value="veraScene">Vera Scene</option>
+					      <option value="harmonyActivity">Harmony Activity</option>
+					      <option value="harmonyButton">Harmony Button</option>
+					    </select>
+					</div>
+					</div>
+				</div>
+				<div ng-if="device.mapType" class="form-group">
+					<label class="col-xs-12 col-sm-2 control-label" for="device-map-id">Map ID
+					</label>
+
+					<div class="col-xs-8 col-sm-7">
+						<input type="text" class="form-control" id="device-map-id"
+							ng-model="device.mapId" placeholder="1111">
+					</div>
+				</div>
 				<div class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-on-url">On
@@ -35,9 +69,6 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'on')">Test</button>
 					</div>
 				</div>
 				<div class="form-group">
@@ -49,9 +80,6 @@
 						<textarea rows="3" class="form-control" id="device-off-url"
 							ng-model="device.offUrl" placeholder="URL to turn device off"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'off')">Test</button>
 					</div>
 				</div>
 				<div class="form-group">
@@ -69,7 +97,7 @@
 					</div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-content-type">Content Type
 					</label>
@@ -94,7 +122,7 @@
 					</div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label"
 						for="device-content-body">Content Body On</label>
@@ -106,7 +134,7 @@
 			        <div class="clearfix visible-xs"></div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label"
 						for="device-content-body-off">Content Body Off</label>

src/main/resources/public/views/editor.html

@@ -98,9 +98,6 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'on')">Test</button>
 					</div>
 				</div>
 				<div class="form-group">
@@ -112,9 +109,6 @@
 						<textarea rows="3" class="form-control" id="device-off-url"
 							ng-model="device.offUrl" placeholder="URL to turn device off"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'off')">Test</button>
 					</div>
 				</div>
 				<div class="form-group">
@@ -132,7 +126,7 @@
    					</div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label"  for="device-content-type">Content Type
 					</label>
@@ -157,7 +151,7 @@
 					</div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label"
 						for="device-content-body">Content Body On</label>
@@ -169,7 +163,7 @@
 			        <div class="clearfix visible-xs"></div>
 					</div>
 				</div>
-				<div class="form-group">
+				<div ng-if="device.httpVerb" class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label"
 						for="device-content-body-off">Content Body Off</label>

src/main/resources/public/views/harmonyactivity.html

@@ -26,13 +26,18 @@
 						<th>
 							<a href="" ng-click="order('id')">Id</a>
         					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
         				</th>
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | orderBy:predicate:reverse">
-					<td>{{harmonyactivity.label}}</td>
-					<td>{{harmonyactivity.id}}</td>
+				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | availableHarmonyActivityId | orderBy:predicate:reverse">
+					<td>{{harmonyactivity.activity.label}}</td>
+					<td>{{harmonyactivity.activity.id}}</td>
+					<td>{{harmonyactivity.hub}}</td>
 					<td>
 						<button class="btn btn-success" type="submit"
 							ng-click="buildActivityUrls(harmonyactivity)">Generate
@@ -42,6 +47,39 @@
 			</table>
 		</li>
 	</ul>
+	<div class="panel-heading">
+		<h2 class="panel-title">Already Configured Activities <a ng-click="toggleActivities()"><span class={{imgActivitiesUrl}} aria-hidden="true"></a></h2>
+	</div>
+	<ul ng-if="activitiesVisible" class="list-group">
+		<li class="list-group-item">
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>
+							<a href="" ng-click="order('label')">Name</a>
+        					<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('id')">Id</a>
+        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>Actions</th>
+					</tr>
+				</thead>
+				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | unavailableHarmonyActivityId | orderBy:predicate:reverse">
+					<td>{{harmonyactivity.activity.label}}</td>
+					<td>{{harmonyactivity.activity.id}}</td>
+					<td>{{harmonyactivity.hub}}</td>
+					<td><button class="btn btn-danger" type="submit"
+						ng-click="deleteDeviceByMapId(harmonyactivity.activity.id, 'harmonyActivity')">Delete</button></td>
+				</tr>
+			</table>
+		</li>
+	</ul>
 </div>
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">

src/main/resources/public/views/harmonydevice.html

@@ -26,6 +26,10 @@
 						<th>
 							<a href="" ng-click="order('id')">Id</a>
         					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
         				</th>
 						<th>On Button</th>
 						<th>Off Button</th>
@@ -33,18 +37,19 @@
 					</tr>
 				</thead>
 				<tr ng-repeat="harmonydevice in bridge.harmonydevices | orderBy:predicate:reverse">
-					<td>{{harmonydevice.label}}</td>
-					<td>{{harmonydevice.id}}</td>
+					<td>{{harmonydevice.device.label}}</td>
+					<td>{{harmonydevice.device.id}}</td>
+					<td>{{harmonydevice.hub}}</td>
 					<td>
 						<select name="device-ctrlon" id="device-ctrlon" ng-model="devicectrlon">
-							<optgroup ng-repeat="ctrlon in harmonydevice.controlGroup" label="{{ctrlon.name}}">
+							<optgroup ng-repeat="ctrlon in harmonydevice.device.controlGroup" label="{{ctrlon.name}}">
 								<option ng-repeat="funcon in ctrlon.function">{{funcon.name}}</option>
 							</optgroup >
 						</select>
 					</td>
 					<td>
 						<select name="device-ctrloff" id="device-ctrloff" ng-model="devicectrloff">
-							<optgroup ng-repeat="ctrloff in harmonydevice.controlGroup" label="{{ctrloff.name}}">
+							<optgroup ng-repeat="ctrloff in harmonydevice.device.controlGroup" label="{{ctrloff.name}}">
 								<option ng-repeat="funcoff in ctrloff.function">{{funcoff.name}}</option>
 							</optgroup >
 						</select>
@@ -58,6 +63,46 @@
 			</table>
 		</li>
 	</ul>
+	<div class="panel-heading">
+		<h2 class="panel-title">Already Configured Harmony Buttons <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}} aria-hidden="true"></span></a></h2>
+	</div>
+	<ul ng-if="buttonsVisible" class="list-group">
+		<li class="list-group-item">
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>
+							<a href="" ng-click="order('name')">Name</a>
+        					<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('id')">Device Id</a>
+        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('targetDevice')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'targetDevice'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('mapId')">Harmony Device-Button On-Button Off</a>
+        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>Actions</th>
+					</tr>
+				</thead>
+				<tr ng-repeat="device in bridge.devices | configuredButtons | orderBy:predicate:reverse">
+					<td>{{device.name}}</td>
+					<td>{{device.id}}</td>
+					<td>{{device.targetDevice}}</td>
+					<td>{{device.mapId}}</td>
+					<td>
+						<button class="btn btn-danger" type="submit"
+						ng-click="deleteDeviceByMapId(device.mapId, device.mapType)">Delete</button>
+					</td>
+				</tr>
+			</table>
+		</li>
+	</ul>
 </div>
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">

src/main/resources/public/views/nonconfiguration.html

@@ -1,64 +0,0 @@
-      <ul class="nav nav-pills" role="tablist">
-        <li role="presentation" class="active"><a href="#">Configuration</a></li>
-        <li ng-if="bridge.showVera" role="presentation"><a href="#/veradevices">Vera Devices</a></li>
-        <li ng-if="bridge.showVera" role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
-        <li ng-if="bridge.showHarmony" role="presentation"><a href="#/harmonyactivities">Harmony Activities</a></li>
-        <li ng-if="bridge.showHarmony" role="presentation"><a href="#/harmonydevices">Harmony Devices</a></li>
-        <li role="presentation"><a href="#/editor">Manual Add</a></li>
-      </ul>
-
-	<div ng-controller="ErrorsController">
-		<div ng-if="bridge.error"
-			class="alert alert-warning alert-dismissible" role="alert">
-			<button type="button" class="close" data-dismiss="alert"
-				aria-label="Close">
-				<span aria-hidden="true">&times;</span>
-			</button>
-
-			<h2 ng-show='bridge.error != ""'>ERROR</h2>
-
-			<div ng-show='bridge.error != ""'>{{bridge.error}}</div>
-		</div>
-	</div>
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h2 class="panel-title">Current devices</h2>
-		</div>
-		<table class="table table-bordered table-striped table-hover">
-			<thead>
-				<tr>
-					<th>
-						<a href="" ng-click="order('id')">ID</a>
-        				<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span></th>
-					<th>
-						<a href="" ng-click="order('name')">Name</a>
-        				<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span></th>
-					<th>
-						<a href="" ng-click="order('deviceType')">Type</a>
-        				<span class="sortorder" ng-show="predicate === 'deviceType'" ng-class="{reverse:reverse}"></span></th>
-					<th>Actions</th>
-				</tr>
-			</thead>
-			<tr ng-repeat="device in bridge.devices | orderBy:predicate:reverse">
-				<td>{{device.id}}</td>
-				<td>{{device.name}}</td>
-				<td>{{device.deviceType}}</td>
-				<td>
-					<button class="btn btn-info" type="submit"
-						ng-click="testUrl(device, 'on')">Test ON</button>
-					<button class="btn btn-info" type="submit"
-						ng-click="testUrl(device, 'off')">Test OFF</button>
-					<button class="btn btn-warning" type="submit"
-						ng-click="editDevice(device)">Edit</button>
-					<button class="btn btn-danger" type="submit"
-						ng-click="deleteDevice(device)">Delete</button>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="panel panel-default bridgeServer">
-		<div class="panel-heading">
-  			<a href="#/show"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a>
-			<h1 class="panel-title">Bridge settings</h1>
-		</div>
-	</div>

src/main/resources/public/views/veradevice.html

@@ -45,7 +45,7 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="veradevice in bridge.veradevices | orderBy:predicate:reverse">
+				<tr ng-repeat="veradevice in bridge.veradevices | availableVeraDeviceId | orderBy:predicate:reverse">
 					<td>{{veradevice.name}}</td>
 					<td>{{veradevice.id}}</td>
 					<td>{{veradevice.category}}</td>
@@ -59,6 +59,46 @@
 			</table>
 		</li>
 	</ul>
+	<div class="panel-heading">
+		<h2 class="panel-title">Already Configured Vera Devices <a ng-click="toggleDevices()"><span class={{imgDevicesUrl}} aria-hidden="true"></a></h2>
+	</div>
+	<ul ng-if="devicesVisible" class="list-group">
+		<li class="list-group-item">
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>
+							<a href="" ng-click="order('name')">Name</a>
+        					<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('id')">Id</a>
+        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('category')">Category</a>
+        					<span class="sortorder" ng-show="predicate === 'category'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('room')">Room</a>
+        					<span class="sortorder" ng-show="predicate === 'room'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>Actions</th>
+					</tr>
+				</thead>
+				<tr ng-repeat="veradevice in bridge.veradevices | unavailableVeraDeviceId | orderBy:predicate:reverse">
+					<td>{{veradevice.name}}</td>
+					<td>{{veradevice.id}}</td>
+					<td>{{veradevice.category}}</td>
+					<td>{{veradevice.room}}</td>
+					<td>
+						<button class="btn btn-danger" type="submit"
+						ng-click="deleteDeviceByMapId(veradevice.id, 'veraDevice')">Delete</button>
+					</td>
+				</tr>
+			</table>
+		</li>
+	</ul>
 </div>
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
@@ -87,10 +127,6 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'on')">Test</button>
-					</div>
 				</div>
 				<div class="form-group">
 					<div class="row">
@@ -101,10 +137,6 @@
 						<textarea rows="3" class="form-control" id="device-off-url"
 							ng-model="device.offUrl" placeholder="URL to turn device off"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'off')">Test</button>
-					</div>
 				</div>
 			</form>
 		</li>

src/main/resources/public/views/verascene.html

@@ -34,7 +34,7 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="verascene in bridge.verascenes | orderBy:predicate:reverse">
+				<tr ng-repeat="verascene in bridge.verascenes | availableVeraSceneId | orderBy:predicate:reverse">
 					<td>{{verascene.name}}</td>
 					<td>{{verascene.id}}</td>
 					<td>{{verascene.room}}</td>
@@ -47,6 +47,41 @@
 			</table>
 		</li>
 	</ul>
+	<div class="panel-heading">
+		<h2 class="panel-title">Already Configured Vera Scenes <a ng-click="toggleScenes()"><span class={{imgScenesUrl}} aria-hidden="true"></a></h2>
+	</div>
+	<ul ng-if="scenesVisible" class="list-group">
+		<li class="list-group-item">
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>
+							<a href="" ng-click="order('name')">Name</a>
+        					<span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('id')">Id</a>
+        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('room')">Room</a>
+        					<span class="sortorder" ng-show="predicate === 'room'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>Actions</th>
+					</tr>
+				</thead>
+				<tr ng-repeat="verascene in bridge.verascenes | unavailableVeraSceneId | orderBy:predicate:reverse">
+					<td>{{verascene.name}}</td>
+					<td>{{verascene.id}}</td>
+					<td>{{verascene.room}}</td>
+					<td>
+						<button class="btn btn-danger" type="submit"
+						ng-click="deleteDeviceByMapId(verascene.id, 'veraScene')">Delete</button>
+					</td>
+				</tr>
+			</table>
+		</li>
+	</ul>
 </div>
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
@@ -75,10 +110,6 @@
 						<textarea rows="3" class="form-control" id="device-on-url"
 							ng-model="device.onUrl" placeholder="URL to turn device on"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'on')">Test</button>
-					</div>
 				</div>
 				<div class="form-group">
 					<div class="row">
@@ -89,10 +120,6 @@
 						<textarea rows="3" class="form-control" id="device-off-url"
 							ng-model="device.offUrl" placeholder="URL to turn device off"></textarea>
 					</div>
-			        <div class="clearfix visible-xs"></div>
-					<button class="col-xs-4 col-sm-2 btn btn-success" type="button"
-						ng-click="testUrl(device, 'off')">Test</button>
-					</div>
 				</div>
 			</form>
 		</li>