Finished slider for testint items with percentage items. Many refactors

and fixes.

Fixes #43
Fixes #46
Fixes #47
Fixes #48

README.md

@@ -9,35 +9,12 @@ Otherwise, downloads are available at https://github.com/bwssytems/ha-bridge/rel
 ## Run
 Then locate the jar and start the server with:  
 ```
-java -jar  -Dupnp.config.address=A.B.C.D -Dvera.address=E.F.G.H -Dharmony.address=W.X.Y.Z -Dharmony.user=myself -Dharmony.pwd=passwd ha-bridge-W.X.Y.jar
+java -jar ha-bridge-W.X.Y.jar
 ```
 ## Available Arguments
-### -Dupnp.config.address=`<ip address>`
-The server defaults to the first available address on the host if this is not given. This default may NOT be the correct IP that is your public IP for your host on the network. It is best to set this parameter to not have discovery issues. Replace the -Dupnp.config.address=`<ip address>` value with the server ipv4 address you would like to use as the address that any upnp device will call after discovery. 
-### -Dvera.address=`<ip address>` | `<{devices:[{name:avera,ip:x.y.w.z},{name:anothervera,ip:a.b.c.d}]}>`
-The argument for the vera address should be given as it the system does not have a way to find the address. Supply -Dvera.address=X.Y.Z.A on the command line to provide it. If a vera is not used, do not set it. To provide multiple veras, use the json style notation outlined above to provide the list. The json notation may need to be surrounded by quotation marks when starting from a shell script. Most service scripts will not need the quotation marks. This argument is backwards compatible.
-### -Dserver.port=`<port>`
-The server defaults to running on port 8080. If you're already running a server (like openHAB) on 8080, -Dserver.port=`<port>` on the command line.
-### -Dupnp.device.db=`<filepath>`
-The default location for the db to contain the devices as they are added is the relative path from where the bridge is started in "data/device.db". If you would like a different filename or directory, specify -Dupnp.devices.db=`<directory>/<filename>` explicitly.
-### -Dupnp.response.port=`<port>`
-The upnp response port that will be used. The default is 50000.  
-### -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. The json notation may need to be surrounded by quotation marks when starting from a shell script. Most service scripts will not need the quotation marks. 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>`
-The password for 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.pwd=`<password>` on the command line.
-### -Dbutton.sleep=`<time in milliseconds>`
-The default button press sleep time interval is 100 milliseconds. If you need more time add this parameter. For example 1000 ms is 1 second and you could set -Dbutton.sleep=1000 for the longer interval if you are having issues on your devices not handling button presses fast enough.
-### -Dnest.user=`<username>`
-The user name of the home.nest.com account for the Nest user. This needs to be given if you are using the Nest features, provide -Dnest.user=`<username>` on the command line. There is no need to give any ip address or host information as this contacts your cloud account.
-### -Dnest.pwd=`<password>`
-The password for the user name of the home.nest.com account for the Nestr user. This needs to be given if you are using the Nest features, provide -Dnest.pwd=`<password>` on the command line.
-### -Dupnp.strict=`<true|false>`
-Upnp has been very closed on this platform to try and respond as a hue and there is now a setting to control if it is more open or strict, Add -Dupnp.strict=`<true|false>` to your command line to have the emulator respond to what it thinks is an echo to a hue or any other device. The default is upnp.strict=true.
-### -Dtrace.upnp=`<true|false>`
-Turn on tracing for upnp discovery messages. The default is false.
+Arguments are now depecated. The ha-bridge will use the old -D arguments and populate the config screen which can now be saved to a file and will not be needed. There is only one optional argument that overides and that is the location of the config file. The default is the relative path "data/habridge.config".
+### -Dconfig.file=`<filepath>`
+The default location for the config fileto contain the settings for the bridge is the relative path from where the bridge is started in "data/habridge.config". If you would like a different filename or directory, specify -Dconfig.file=`<directory>/<filename>` explicitly.
 ## HA Bridge Device Configuration
 You must configure devices before you will have any thing for the Echo to receive. The easy way to get devices configures is with the web interface by going to the url for the host you are running on or localhost with port you have assigned: and use the helpers for the Vera or Harmony Hub to create devices that the Echo will find.
 

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.3.8</version>
+	<version>1.4.0</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.github.bwssytems</groupId>
             <artifactId>nest-controller</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 		<dependency>
 		    <groupId>com.sparkjava</groupId>

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

@@ -0,0 +1,95 @@
+package com.bwssystems.HABridge;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class BackupHandler {
+    final Logger log = LoggerFactory.getLogger(BackupHandler.class);
+    private Path repositoryPath;
+    private String fileExtension;
+    private String defaultName;
+
+	protected void setupParams(Path aPath, String anExtension, String adefaultName) {
+		repositoryPath = aPath;
+		if(anExtension.substring(0, 1).equalsIgnoreCase("."))
+			fileExtension = anExtension;
+		else
+			fileExtension = "." + anExtension;
+		
+		defaultName = adefaultName;
+		
+		log.debug("setupParams has defaultName: " + defaultName + " and file extension as: " + fileExtension);
+	}
+
+	public String backup(String aFilename) {
+        if(aFilename == null || aFilename.equalsIgnoreCase("")) {
+        	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+        	aFilename = defaultName + dateFormat.format(Calendar.getInstance().getTime()) + fileExtension; 
+        }
+        else
+        	aFilename = aFilename + fileExtension;
+    	try {
+			Files.copy(repositoryPath, FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename), StandardCopyOption.COPY_ATTRIBUTES);
+		} catch (IOException e) {
+			log.error("Could not backup to file: " + aFilename + " message: " + e.getMessage(), e);
+		}
+        log.debug("Backup repository: " + aFilename);
+        return aFilename;
+    }
+
+	public String deleteBackup(String aFilename) {
+        log.debug("Delete backup repository: " + aFilename);
+        try {
+			Files.delete(FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename));
+		} catch (IOException e) {
+			log.error("Could not delete file: " + aFilename + " message: " + e.getMessage(), e);
+		}
+        return aFilename;
+    }
+
+	public String restoreBackup(String aFilename) {
+        log.debug("Restore backup repository: " + aFilename);
+		try {
+			Path target = null;
+			if(Files.exists(repositoryPath)) {
+	        	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+				target = FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), defaultName + dateFormat.format(Calendar.getInstance().getTime()) + fileExtension);
+				Files.move(repositoryPath, target);
+			}
+			Files.copy(FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename), repositoryPath, StandardCopyOption.COPY_ATTRIBUTES);
+		} catch (IOException e) {
+			log.error("Error restoring the file: " + aFilename + " message: " + e.getMessage(), e);
+			return null;
+		}
+        return aFilename;
+    }
+
+	public List<String> getBackups() {
+		List<String> theFilenames = new ArrayList<String>();
+		Path dir = repositoryPath.getParent();
+		try (DirectoryStream<Path> stream =
+		     Files.newDirectoryStream(dir, "*.{"+ fileExtension.substring(1) + "}")) {
+		    for (Path entry: stream) {
+		        theFilenames.add(entry.getFileName().toString());
+		    }
+		} catch (IOException x) {
+		    // IOException can never be thrown by the iteration.
+		    // In this snippet, it can // only be thrown by newDirectoryStream.
+			log.warn("Issue getting directory listing for backups in directory: " + x.getMessage());
+		}
+		return theFilenames;
+	}
+	
+}

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

@@ -0,0 +1,25 @@
+package com.bwssystems.HABridge;
+
+public class BridgeControlDescriptor {
+	private boolean reinit;
+	private boolean stop;
+
+	public BridgeControlDescriptor() {
+		super();
+		this.reinit = false;
+		this.stop = false;
+	}
+
+	public boolean isReinit() {
+		return reinit;
+	}
+	public void setReinit(boolean reinit) {
+		this.reinit = reinit;
+	}
+	public boolean isStop() {
+		return stop;
+	}
+	public void setStop(boolean stop) {
+		this.stop = stop;
+	}
+}

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

@@ -1,135 +1,239 @@
 package com.bwssystems.HABridge;
 
-import java.util.List;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Enumeration;
 
-public class BridgeSettings {
-	private String upnpconfigaddress;
-	private String serverport;
-	private String upnpresponseport;
-	private String upnpdevicedb;
-	private IpList veraaddress;
-	private IpList harmonyaddress;
-	private String harmonyuser;
-	private String harmonypwd;
-	private Integer buttonsleep;
-	private boolean upnpstrict;
-	private boolean traceupnp;
-	private boolean devmode;
-	private String nestuser;
-	private String nestpwd;
-	private boolean nestconfigured;
+import org.apache.http.conn.util.InetAddressUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+
+public class BridgeSettings extends BackupHandler {
+	private BridgeSettingsDescriptor theBridgeSettings;
+	private BridgeControlDescriptor bridgeControl;
 	
-	public String getUpnpConfigAddress() {
-		return upnpconfigaddress;
+	public BridgeSettings() {
+		super();
+		bridgeControl = new BridgeControlDescriptor();
+		theBridgeSettings = new BridgeSettingsDescriptor();
 	}
-	public void setUpnpConfigAddress(String upnpConfigAddress) {
-		this.upnpconfigaddress = upnpConfigAddress;
+	public BridgeControlDescriptor getBridgeControl() {
+		return bridgeControl;
 	}
-	public String getServerPort() {
-		return serverport;
+	public BridgeSettingsDescriptor getBridgeSettingsDescriptor() {
+		return theBridgeSettings;
 	}
-	public void setServerPort(String serverPort) {
-		this.serverport = serverPort;
+	public void buildSettings() {
+        Logger log = LoggerFactory.getLogger(BridgeSettings.class);
+        InetAddress address = null;
+        String addressString = null;
+        String theVeraAddress = null;
+        String theHarmonyAddress = null;
+        String configFileProperty = System.getProperty("config.file");
+        if(configFileProperty == null) {
+        	Path filePath = Paths.get(Configuration.CONFIG_FILE);
+        	if(Files.exists(filePath) && Files.isReadable(filePath))
+        		configFileProperty = Configuration.CONFIG_FILE;
+        }
+        if(configFileProperty != null)
+        {
+        	log.info("reading from config file: " + configFileProperty);
+        	theBridgeSettings.setConfigfile(configFileProperty);
+        	_loadConfig();
+        }
+        else
+        {
+        	log.info("reading from system properties");
+        	theBridgeSettings.setConfigfile(Configuration.CONFIG_FILE);
+        	theBridgeSettings.setServerPort(System.getProperty("server.port", Configuration.DEFAULT_WEB_PORT));
+        	theBridgeSettings.setUpnpConfigAddress(System.getProperty("upnp.config.address"));
+        	theBridgeSettings.setUpnpDeviceDb(System.getProperty("upnp.device.db"));
+        	theBridgeSettings.setUpnpResponsePort(System.getProperty("upnp.response.port", Configuration.UPNP_RESPONSE_PORT));
+	        
+	        theVeraAddress = System.getProperty("vera.address");
+        	IpList theVeraList = null;	
+	        if(theVeraAddress != null) {
+		        try {
+		        	theVeraList = new Gson().fromJson(theVeraAddress, IpList.class);
+		        } catch (Exception e) {
+		        	try {
+		        		theVeraList = new Gson().fromJson("{devices:[{name:default,ip:" + theVeraAddress + "}]}", IpList.class);
+		        	} catch (Exception et) {
+		    	        log.error("Cannot parse vera.address, not set with message: " + e.getMessage(), e);
+		    	        theVeraList = null;
+		        	}
+		        }
+	        }
+	        theBridgeSettings.setVeraAddress(theVeraList);
+
+	        theHarmonyAddress = System.getProperty("harmony.address");
+	        IpList theHarmonyList = null;	
+	        if(theHarmonyAddress != null) {
+		        try {
+		        	theHarmonyList = new Gson().fromJson(theHarmonyAddress, IpList.class);
+		        } catch (Exception e) {
+		        	try {
+		        		theHarmonyList = new Gson().fromJson("{devices:[{name:default,ip:" + theHarmonyAddress + "}]}", IpList.class);
+		        	} catch (Exception et) {
+		    	        log.error("Cannot parse harmony.address, not set with message: " + e.getMessage(), e);
+		    	        theHarmonyList = null;
+		        	}
+		        }
+	        }
+	        theBridgeSettings.setHarmonyAddress(theHarmonyList);
+	        theBridgeSettings.setHarmonyUser(System.getProperty("harmony.user"));
+	        theBridgeSettings.setHarmonyPwd(System.getProperty("harmony.pwd"));
+	        theBridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
+	        theBridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
+	        theBridgeSettings.setButtonsleep(Integer.parseInt(System.getProperty("button.sleep", Configuration.DEFAULT_BUTTON_SLEEP)));
+	        theBridgeSettings.setNestuser(System.getProperty("nest.user"));
+	        theBridgeSettings.setNestpwd(System.getProperty("nest.pwd"));
+        }
+
+        if(theBridgeSettings.getUpnpConfigAddress() == null || theBridgeSettings.getUpnpConfigAddress().equals("")) {
+	        try {
+	        	log.info("Getting an IP address for this host....");
+				Enumeration<NetworkInterface> ifs =	NetworkInterface.getNetworkInterfaces();
+	
+				while (ifs.hasMoreElements() && addressString == null) {
+					NetworkInterface xface = ifs.nextElement();
+					Enumeration<InetAddress> addrs = xface.getInetAddresses();
+					String name = xface.getName();
+					int IPsPerNic = 0;
+	
+					while (addrs.hasMoreElements() && IPsPerNic == 0) {
+						address = addrs.nextElement();
+						if (InetAddressUtils.isIPv4Address(address.getHostAddress())) {
+							log.debug(name + " ... has IPV4 addr " + address);
+							if(!name.equalsIgnoreCase(Configuration.LOOP_BACK_INTERFACE)|| !address.getHostAddress().equalsIgnoreCase(Configuration.LOOP_BACK_ADDRESS)) {
+								IPsPerNic++;
+								addressString = address.getHostAddress();
+								log.info("Adding " + addressString + " from interface " + name + " as our default upnp config address.");
+							}
+						}
+					} 
+				}
+			} catch (SocketException e) {
+		        log.error("Cannot get ip address of this host, Exiting with message: " + e.getMessage(), e);
+		        return;
+			}
+	        
+	        theBridgeSettings.setUpnpConfigAddress(addressString);
+        }
+        
+        if(theBridgeSettings.getUpnpResponsePort() == null)
+        	theBridgeSettings.setUpnpResponsePort(Configuration.UPNP_RESPONSE_PORT);
+        
+        if(theBridgeSettings.getServerPort() == null)
+        	theBridgeSettings.setServerPort(Configuration.DEFAULT_WEB_PORT);
+        
+        if(theBridgeSettings.getUpnpDeviceDb() == null)
+        	theBridgeSettings.setUpnpDeviceDb(Configuration.DEVICE_DB_DIRECTORY);
+        
+        if(theBridgeSettings.getButtonsleep() <= 0)
+        	theBridgeSettings.setButtonsleep(Integer.parseInt(Configuration.DEFAULT_BUTTON_SLEEP));
+
+        theBridgeSettings.setVeraconfigured(theBridgeSettings.isValidVera());
+        theBridgeSettings.setHarmonyconfigured(theBridgeSettings.isValidHarmony());
+        theBridgeSettings.setNestConfigured(theBridgeSettings.isValidNest());
+		setupParams(Paths.get(theBridgeSettings.getConfigfile()), ".cfgbk", "habridge.config-");
 	}
-	public String getUpnpResponsePort() {
-		return upnpresponseport;
+
+	public void loadConfig() {
+		if(theBridgeSettings.getConfigfile() != null)
+			_loadConfig();
 	}
-	public void setUpnpResponsePort(String upnpResponsePort) {
-		this.upnpresponseport = upnpResponsePort;
+	private void _loadConfig() {
+		Path configPath = Paths.get(theBridgeSettings.getConfigfile());
+		_loadConfig(configPath);
+    }
+
+	private void _loadConfig(Path aPath) {
+		String jsonContent = configReader(aPath);
+		BridgeSettingsDescriptor aBridgeSettings = new Gson().fromJson(jsonContent, BridgeSettingsDescriptor.class);
+		theBridgeSettings.setButtonsleep(aBridgeSettings.getButtonsleep());
+		theBridgeSettings.setUpnpConfigAddress(aBridgeSettings.getUpnpConfigAddress());
+		theBridgeSettings.setServerPort(aBridgeSettings.getServerPort());
+		theBridgeSettings.setUpnpResponsePort(aBridgeSettings.getUpnpResponsePort());
+		theBridgeSettings.setUpnpDeviceDb(aBridgeSettings.getUpnpDeviceDb());
+		theBridgeSettings.setVeraAddress(aBridgeSettings.getVeraAddress());
+		theBridgeSettings.setHarmonyAddress(aBridgeSettings.getHarmonyAddress());
+		theBridgeSettings.setHarmonyUser(aBridgeSettings.getHarmonyUser());
+		theBridgeSettings.setHarmonyPwd(aBridgeSettings.getHarmonyPwd());
+		theBridgeSettings.setUpnpStrict(aBridgeSettings.isUpnpStrict());
+		theBridgeSettings.setTraceupnp(aBridgeSettings.isTraceupnp());
+		theBridgeSettings.setNestuser(aBridgeSettings.getNestuser());
+		theBridgeSettings.setNestpwd(aBridgeSettings.getNestpwd());
+		theBridgeSettings.setVeraconfigured(aBridgeSettings.isValidVera());
+		theBridgeSettings.setHarmonyconfigured(aBridgeSettings.isValidHarmony());
+		theBridgeSettings.setNestConfigured(aBridgeSettings.isValidNest());
+    }
+
+	public void save(BridgeSettingsDescriptor newBridgeSettings) {
+        Logger log = LoggerFactory.getLogger(BridgeSettings.class);
+        log.debug("Save HA Bridge settings.");
+		Path configPath = Paths.get(theBridgeSettings.getConfigfile());
+    	JsonTransformer aRenderer = new JsonTransformer();
+    	String  jsonValue = aRenderer.render(newBridgeSettings);
+    	configWriter(jsonValue, configPath);
+    	_loadConfig(configPath);
+    }
+    
+
+	private void configWriter(String content, Path filePath) {
+        Logger log = LoggerFactory.getLogger(BridgeSettings.class);
+		if(Files.exists(filePath) && !Files.isWritable(filePath)){
+			log.error("Error file is not writable: " + filePath);
+			return;
+		}
+		
+		if(Files.notExists(filePath.getParent())) {
+			try {
+				Files.createDirectories(filePath.getParent());
+			} catch (IOException e) {
+				log.error("Error creating the directory: " + filePath + " message: " + e.getMessage(), e);
+			}
+		}
+
+		try {
+			Path target = null;
+			if(Files.exists(filePath)) {
+				target = FileSystems.getDefault().getPath(filePath.getParent().toString(), "habridge.config.old");
+				Files.move(filePath, target);
+			}
+			Files.write(filePath, content.getBytes(), StandardOpenOption.CREATE);
+			if(target != null)
+				Files.delete(target);
+		} catch (IOException e) {
+			log.error("Error writing the file: " + filePath + " message: " + e.getMessage(), e);
+		}
 	}
-	public String getUpnpDeviceDb() {
-		return upnpdevicedb;
-	}
-	public void setUpnpDeviceDb(String upnpDeviceDb) {
-		this.upnpdevicedb = upnpDeviceDb;
-	}
-	public IpList getVeraAddress() {
-		return veraaddress;
-	}
-	public void setVeraAddress(IpList veraAddress) {
-		this.veraaddress = veraAddress;
-	}
-	public IpList getHarmonyAddress() {
-		return harmonyaddress;
-	}
-	public void setHarmonyAddress(IpList harmonyaddress) {
-		this.harmonyaddress = harmonyaddress;
-	}
-	public String getHarmonyUser() {
-		return harmonyuser;
-	}
-	public void setHarmonyUser(String harmonyuser) {
-		this.harmonyuser = harmonyuser;
-	}
-	public String getHarmonyPwd() {
-		return harmonypwd;
-	}
-	public void setHarmonyPwd(String harmonypwd) {
-		this.harmonypwd = harmonypwd;
-	}
-	public boolean isUpnpStrict() {
-		return upnpstrict;
-	}
-	public void setUpnpStrict(boolean upnpStrict) {
-		this.upnpstrict = upnpStrict;
-	}
-	public boolean isTraceupnp() {
-		return traceupnp;
-	}
-	public void setTraceupnp(boolean traceupnp) {
-		this.traceupnp = traceupnp;
-	}
-	public boolean isDevMode() {
-		return devmode;
-	}
-	public void setDevMode(boolean devmode) {
-		this.devmode = devmode;
-	}
-	public String getNestuser() {
-		return nestuser;
-	}
-	public void setNestuser(String nestuser) {
-		this.nestuser = nestuser;
-	}
-	public String getNestpwd() {
-		return nestpwd;
-	}
-	public void setNestpwd(String nestpwd) {
-		this.nestpwd = nestpwd;
-	}
-	public boolean isNestConfigured() {
-		return nestconfigured;
-	}
-	public void setNestConfigured(boolean isNestConfigured) {
-		this.nestconfigured = isNestConfigured;
-	}
-	public Integer getButtonsleep() {
-		return buttonsleep;
-	}
-	public void setButtonsleep(Integer buttonsleep) {
-		this.buttonsleep = buttonsleep;
-	}
-	public Boolean isValidVera() {
-		List<NamedIP> devicesList = this.veraaddress.getDevices();
-		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
-			return false;
-		return true;
-	}
-	public Boolean isValidHarmony() {
-		List<NamedIP> devicesList = this.harmonyaddress.getDevices();
-		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
-			return false;
-		if(this.harmonypwd == null || this.harmonypwd == "")
-			return false;
-		if(this.harmonyuser == null || this.harmonyuser == "")
-			return false;
-		return true;
-	}
-	public Boolean isValidNest() {
-		if(this.nestpwd == null || this.nestpwd == "")
-			return false;
-		if(this.nestuser == null || this.nestuser == "")
-			return false;
-		return true;
+	
+	private String configReader(Path filePath) {
+        Logger log = LoggerFactory.getLogger(BridgeSettings.class);
+
+		String content = null;
+		if(Files.notExists(filePath) || !Files.isReadable(filePath)){
+			log.warn("Error reading the file: " + filePath + " - Does not exist or is not readable. continuing...");
+			return null;
+		}
+
+		
+		try {
+			content = new String(Files.readAllBytes(filePath));
+		} catch (IOException e) {
+			log.error("Error reading the file: " + filePath + " message: " + e.getMessage(), e);
+		}
+		
+		return content;
 	}
 }

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

@@ -0,0 +1,168 @@
+package com.bwssystems.HABridge;
+
+import java.util.List;
+
+public class BridgeSettingsDescriptor {
+	private String upnpconfigaddress;
+	private Integer serverport;
+	private Integer upnpresponseport;
+	private String upnpdevicedb;
+	private IpList veraaddress;
+	private IpList harmonyaddress;
+	private String harmonyuser;
+	private String harmonypwd;
+	private Integer buttonsleep;
+	private boolean upnpstrict;
+	private boolean traceupnp;
+	private String nestuser;
+	private String nestpwd;
+	private boolean veraconfigured;
+	private boolean harmonyconfigured;
+	private boolean nestconfigured;
+	private String configfile;
+	
+	public BridgeSettingsDescriptor() {
+		super();
+		this.upnpstrict = true;
+		this.traceupnp = false;
+		this.nestconfigured = false;
+		this.veraconfigured = false;
+		this.harmonyconfigured = false;
+	}
+	public String getUpnpConfigAddress() {
+		return upnpconfigaddress;
+	}
+	public void setUpnpConfigAddress(String upnpConfigAddress) {
+		this.upnpconfigaddress = upnpConfigAddress;
+	}
+	public Integer  getServerPort() {
+		return serverport;
+	}
+	public void setServerPort(Integer serverPort) {
+		this.serverport = serverPort;
+	}
+	public void setServerPort(String serverPort) {
+		this.serverport = Integer.valueOf(serverPort);
+	}
+	public Integer getUpnpResponsePort() {
+		return upnpresponseport;
+	}
+	public void setUpnpResponsePort(Integer upnpResponsePort) {
+		this.upnpresponseport = upnpResponsePort;
+	}
+	public void setUpnpResponsePort(String upnpResponsePort) {
+		this.upnpresponseport = Integer.valueOf(upnpResponsePort);
+	}
+	public String getUpnpDeviceDb() {
+		return upnpdevicedb;
+	}
+	public void setUpnpDeviceDb(String upnpDeviceDb) {
+		this.upnpdevicedb = upnpDeviceDb;
+	}
+	public IpList getVeraAddress() {
+		return veraaddress;
+	}
+	public void setVeraAddress(IpList veraAddress) {
+		this.veraaddress = veraAddress;
+	}
+	public IpList getHarmonyAddress() {
+		return harmonyaddress;
+	}
+	public void setHarmonyAddress(IpList harmonyaddress) {
+		this.harmonyaddress = harmonyaddress;
+	}
+	public String getHarmonyUser() {
+		return harmonyuser;
+	}
+	public void setHarmonyUser(String harmonyuser) {
+		this.harmonyuser = harmonyuser;
+	}
+	public String getHarmonyPwd() {
+		return harmonypwd;
+	}
+	public void setHarmonyPwd(String harmonypwd) {
+		this.harmonypwd = harmonypwd;
+	}
+	public boolean isUpnpStrict() {
+		return upnpstrict;
+	}
+	public void setUpnpStrict(boolean upnpStrict) {
+		this.upnpstrict = upnpStrict;
+	}
+	public boolean isTraceupnp() {
+		return traceupnp;
+	}
+	public void setTraceupnp(boolean traceupnp) {
+		this.traceupnp = traceupnp;
+	}
+	public String getNestuser() {
+		return nestuser;
+	}
+	public void setNestuser(String nestuser) {
+		this.nestuser = nestuser;
+	}
+	public String getNestpwd() {
+		return nestpwd;
+	}
+	public void setNestpwd(String nestpwd) {
+		this.nestpwd = nestpwd;
+	}
+	public boolean isVeraconfigured() {
+		return veraconfigured;
+	}
+	public void setVeraconfigured(boolean veraconfigured) {
+		this.veraconfigured = veraconfigured;
+	}
+	public boolean isHarmonyconfigured() {
+		return harmonyconfigured;
+	}
+	public void setHarmonyconfigured(boolean harmonyconfigured) {
+		this.harmonyconfigured = harmonyconfigured;
+	}
+	public boolean isNestConfigured() {
+		return nestconfigured;
+	}
+	public void setNestConfigured(boolean isNestConfigured) {
+		this.nestconfigured = isNestConfigured;
+	}
+	public Integer getButtonsleep() {
+		return buttonsleep;
+	}
+	public void setButtonsleep(Integer buttonsleep) {
+		this.buttonsleep = buttonsleep;
+	}
+	public String getConfigfile() {
+		return configfile;
+	}
+	public void setConfigfile(String configfile) {
+		this.configfile = configfile;
+	}
+	public Boolean isValidVera() {
+		if(this.getVeraAddress() == null)
+			return false;
+		List<NamedIP> devicesList = this.getVeraAddress().getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
+			return false;
+		return true;
+	}
+	public Boolean isValidHarmony() {
+		if(this.getHarmonyAddress() == null || this.getHarmonyAddress().getDevices().size() <= 0)
+			return false;		
+		List<NamedIP> devicesList = this.getHarmonyAddress().getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
+			return false;
+		if(this.getHarmonyPwd() == null || this.getHarmonyPwd().equals(""))
+			return false;
+		if(this.getHarmonyUser() == null || this.getHarmonyUser().equals(""))
+			return false;
+		return true;
+	}
+	public Boolean isValidNest() {
+		if(this.getNestpwd() == null || this.getNestpwd().equals(""))
+			return false;
+		if(this.getNestuser() == null || this.getNestuser().equals(""))
+			return false;
+		return true;
+	}
+	
+}

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

@@ -3,13 +3,12 @@ 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_ADDRESS = "1.1.1.1";
 	public final static String LOOP_BACK_ADDRESS = "127.0.0.1";
 	public final static String LOOP_BACK_INTERFACE = "lo";
-	public final static String DEFAULT_HARMONY_ADDRESS_LIST = "{devices:[{name:default,ip:1.1.1.1}]}";
-	public final static String DEFAULT_USER = "";
-	public final static String DEFAULT_PWD = "";
-	public final static String DFAULT_WEB_PORT = "8080";
-	public final static String DFAULT_BUTTON_SLEEP = "100";
+	public final static String DEFAULT_WEB_PORT = "8080";
+	public final static String DEFAULT_BUTTON_SLEEP = "100";
+	public static final int UPNP_DISCOVERY_PORT = 1900;
+	public static final String UPNP_MULTICAST_ADDRESS = "239.255.255.250";
+	public static final String CONFIG_FILE = "data/habridge.config";
 }

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

@@ -2,12 +2,6 @@ package com.bwssystems.HABridge;
 
 import static spark.Spark.*;
 
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-
-import org.apache.http.conn.util.InetAddressUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +11,6 @@ import com.bwssystems.HABridge.upnp.UpnpListener;
 import com.bwssystems.HABridge.upnp.UpnpSettingsResource;
 import com.bwssystems.NestBridge.NestHome;
 import com.bwssystems.harmony.HarmonyHome;
-import com.google.gson.Gson;
 
 public class HABridge {
 	
@@ -44,109 +37,55 @@ public class HABridge {
         HueMulator theHueMulator;
         UpnpSettingsResource theSettingResponder;
         UpnpListener theUpnpListener;
-        InetAddress address = null;
-        String addressString = null;
+        SystemControl theSystem;
         BridgeSettings bridgeSettings;
         Version theVersion;
         
         theVersion = new Version();
 
-        log.info("HA Bridge (v" + theVersion.getVersion() + ") starting setup....");
+        log.info("HA Bridge (v" + theVersion.getVersion() + ") starting....");
         
         bridgeSettings = new BridgeSettings();
-        bridgeSettings.setServerPort(System.getProperty("server.port", Configuration.DFAULT_WEB_PORT));
-        bridgeSettings.setUpnpConfigAddress(System.getProperty("upnp.config.address", Configuration.DEFAULT_ADDRESS));
-        if(bridgeSettings.getUpnpConfigAddress().equalsIgnoreCase(Configuration.DEFAULT_ADDRESS)) {
-	        try {
-	        	log.info("Getting an IP address for this host....");
-				Enumeration<NetworkInterface> ifs =	NetworkInterface.getNetworkInterfaces();
+        while(!bridgeSettings.getBridgeControl().isStop()) {
+        	bridgeSettings.buildSettings();
+            log.info("HA Bridge (v" + theVersion.getVersion() + ") initializing....");
+	        // 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
+	        port(bridgeSettings.getBridgeSettingsDescriptor().getServerPort());
+	        // sparkjava config directive to set html static file location for Jetty
+	        staticFileLocation("/public");
+	        // setup system control api first
+	        theSystem = new SystemControl(bridgeSettings, theVersion);
+	        theSystem.setupServer();
+	        //setup the harmony connection if available
+	        harmonyHome = new HarmonyHome(bridgeSettings.getBridgeSettingsDescriptor());
+	        //setup the nest connection if available
+	        nestHome = new NestHome(bridgeSettings.getBridgeSettingsDescriptor());
+	        // setup the class to handle the resource setup rest api
+	        theResources = new DeviceResource(bridgeSettings.getBridgeSettingsDescriptor(), harmonyHome, nestHome);
+	        // setup the class to handle the hue emulator rest api
+	        theHueMulator = new HueMulator(bridgeSettings.getBridgeSettingsDescriptor(), theResources.getDeviceRepository(), harmonyHome, nestHome);
+	        theHueMulator.setupServer();
+	        // setup the class to handle the upnp response rest api
+	        theSettingResponder = new UpnpSettingsResource(bridgeSettings.getBridgeSettingsDescriptor());
+	        theSettingResponder.setupServer();
+	        // wait for the sparkjava initialization of the rest api classes to be complete
+	        awaitInitialization();
 	
-				while (ifs.hasMoreElements() && addressString == null) {
-					NetworkInterface xface = ifs.nextElement();
-					Enumeration<InetAddress> addrs = xface.getInetAddresses();
-					String name = xface.getName();
-					int IPsPerNic = 0;
-	
-					while (addrs.hasMoreElements() && IPsPerNic == 0) {
-						address = addrs.nextElement();
-						if (InetAddressUtils.isIPv4Address(address.getHostAddress())) {
-							log.debug(name + " ... has IPV4 addr " + address);
-							if(!name.equalsIgnoreCase(Configuration.LOOP_BACK_INTERFACE)|| !address.getHostAddress().equalsIgnoreCase(Configuration.LOOP_BACK_ADDRESS)) {
-								IPsPerNic++;
-								addressString = address.getHostAddress();
-								log.info("Adding " + addressString + " from interface " + name + " as our default upnp config address.");
-							}
-						}
-					}
-				}
-			} catch (SocketException e) {
-		        log.error("Cannot get ip address of this host, Exiting with message: " + e.getMessage(), e);
-		        return;
-			}
-	        
-	        bridgeSettings.setUpnpConfigAddress(addressString);
-        }
-        
-        bridgeSettings.setUpnpDeviceDb(System.getProperty("upnp.device.db", Configuration.DEVICE_DB_DIRECTORY));
-        bridgeSettings.setUpnpResponsePort(System.getProperty("upnp.response.port", Configuration.UPNP_RESPONSE_PORT));
-        IpList theVeraList;
+	        // start the upnp ssdp discovery listener
+	        theUpnpListener = new UpnpListener(bridgeSettings.getBridgeSettingsDescriptor(), bridgeSettings.getBridgeControl());
+	        if(theUpnpListener.startListening())
+	        	log.info("HA Bridge (v" + theVersion.getVersion() + ") reinitialization requessted....");
 
-        try {
-        	theVeraList = new Gson().fromJson(System.getProperty("vera.address", Configuration.DEFAULT_HARMONY_ADDRESS_LIST), IpList.class);
-        } catch (Exception e) {
-        	try {
-        		theVeraList = new Gson().fromJson("{devices:[{name:default,ip:" + System.getProperty("vera.address", Configuration.DEFAULT_ADDRESS) + "}]}", IpList.class);
-        	} catch (Exception et) {
-    	        log.error("Cannot parse vera.address, Exiting with message: " + e.getMessage(), e);
-    	        return;
-        	}
+	        bridgeSettings.getBridgeControl().setReinit(false);
+	        stop();
+	        nestHome.closeTheNest();
+	        nestHome = null;
+	        harmonyHome.shutdownHarmonyHubs();
+	        harmonyHome = null;
         }
-        bridgeSettings.setVeraAddress(theVeraList);
-        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_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_USER));
-        bridgeSettings.setHarmonyPwd(System.getProperty("harmony.pwd", Configuration.DEFAULT_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.setButtonsleep(Integer.parseInt(System.getProperty("button.sleep", Configuration.DFAULT_BUTTON_SLEEP)));
-        bridgeSettings.setNestuser(System.getProperty("nest.user", Configuration.DEFAULT_USER));
-        bridgeSettings.setNestpwd(System.getProperty("nest.pwd", Configuration.DEFAULT_PWD));
-        
-        // 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
-        port(Integer.valueOf(bridgeSettings.getServerPort()));
-        // sparkjava config directive to set html static file location for Jetty
-        staticFileLocation("/public");
-        //setup the harmony connection if available
-        harmonyHome = new HarmonyHome(bridgeSettings);
-        //setup the nest connection if available
-        nestHome = new NestHome(bridgeSettings);
-        // setup the class to handle the resource setup rest api
-        theResources = new DeviceResource(bridgeSettings, theVersion, harmonyHome, nestHome);
-        // setup the class to handle the hue emulator rest api
-        theHueMulator = new HueMulator(bridgeSettings, theResources.getDeviceRepository(), harmonyHome, nestHome);
-        theHueMulator.setupServer();
-        // setup the class to handle the upnp response rest api
-        theSettingResponder = new UpnpSettingsResource(bridgeSettings);
-        theSettingResponder.setupServer();
-        // wait for the sparkjava initialization of the rest api classes to be complete
-        awaitInitialization();
-
-        // start the upnp ssdp discovery listener
-        theUpnpListener = new UpnpListener(bridgeSettings);
-        theUpnpListener.startListening();
+        log.info("HA Bridge (v" + theVersion.getVersion() + ") exiting....");
+        System.exit(0);
     }
 }

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

@@ -0,0 +1,192 @@
+package com.bwssystems.HABridge;
+
+import static spark.Spark.get;
+import static spark.Spark.options;
+import static spark.Spark.post;
+import static spark.Spark.put;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+
+import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bwssystems.HABridge.dao.BackupFilename;
+import com.google.gson.Gson;
+
+public class SystemControl {
+    private static final Logger log = LoggerFactory.getLogger(SystemControl.class);
+    private static final String SYSTEM_CONTEXT = "/system";
+    private BridgeSettings bridgeSettings;
+    private Version version;
+
+	public SystemControl(BridgeSettings theBridgeSettings, Version theVersion) {
+        this.bridgeSettings = theBridgeSettings;
+		this.version = theVersion;
+	}
+
+//	This function sets up the sparkjava rest calls for the hue api
+    public void setupServer() {
+    	log.info("Hue emulator service started....");
+	    // http://ip_address:port/system/habridge/version gets the version of this bridge instance
+    	get (SYSTEM_CONTEXT + "/habridge/version", "application/json", (request, response) -> {
+	    	log.debug("Get HA Bridge version: v" + version.getVersion());
+			response.status(HttpStatus.SC_OK);
+	        return "{\"version\":\"" + version.getVersion() + "\"}";
+	    });
+
+//      http://ip_address:port/system/settings which returns the bridge configuration settings
+		get(SYSTEM_CONTEXT + "/settings", "application/json", (request, response) -> {
+			log.debug("bridge settings requested from " + request.ip());
+
+			response.status(200);
+
+            return bridgeSettings.getBridgeSettingsDescriptor();
+        }, new JsonTransformer());
+		
+//      http://ip_address:port/system/settings CORS request
+	    options(SYSTEM_CONTEXT + "/settings", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "GET, POST, PUT");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+//      http://ip_address:port/system/settings which returns the bridge configuration settings
+		put(SYSTEM_CONTEXT + "/settings", "application/json", (request, response) -> {
+			log.debug("save bridge settings requested from " + request.ip() + " with body: " + request.body());
+			BridgeSettingsDescriptor newBridgeSettings = new Gson().fromJson(request.body(), BridgeSettingsDescriptor.class);
+			bridgeSettings.save(newBridgeSettings);
+			response.status(200);
+
+            return bridgeSettings.getBridgeSettingsDescriptor();
+        }, new JsonTransformer());
+		
+	    // http://ip_address:port/system/control/reinit CORS request
+	    options(SYSTEM_CONTEXT + "/control/reinit", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "GET, POST, PUT");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+	    // http://ip_address:port/system/control/reinit sets the parameter reinit the server
+	    put(SYSTEM_CONTEXT + "/control/reinit", "application/json", (request, response) -> {
+	    	return reinit();
+	    });
+
+	    // http://ip_address:port/system/control/stop CORS request
+	    options(SYSTEM_CONTEXT + "/control/stop", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "GET, POST, PUT");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+	    // http://ip_address:port/system/control/stop sets the parameter stop the server
+	    put(SYSTEM_CONTEXT + "/control/stop", "application/json", (request, response) -> {
+	    	return stop();
+	    });
+
+	    // http://ip_address:port/system/backup/available returns a list of config backup filenames
+	    get (SYSTEM_CONTEXT + "/backup/available", "application/json", (request, response) -> {
+        	log.debug("Get backup filenames");
+          	response.status(HttpStatus.SC_OK);
+          	return bridgeSettings.getBackups();
+        }, new JsonTransformer());
+
+	    // http://ip_address:port/system/backup/create CORS request
+	    options(SYSTEM_CONTEXT + "/backup/create", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "PUT");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+    	put (SYSTEM_CONTEXT + "/backup/create", "application/json", (request, response) -> {
+	    	log.debug("Create backup: " + request.body());
+        	BackupFilename aFilename = new Gson().fromJson(request.body(), BackupFilename.class);
+        	BackupFilename returnFilename = new BackupFilename();
+        	returnFilename.setFilename(bridgeSettings.backup(aFilename.getFilename()));
+	        return returnFilename;
+    	}, new JsonTransformer());
+
+	    // http://ip_address:port/system/backup/delete CORS request
+	    options(SYSTEM_CONTEXT + "/backup/delete", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "POST");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+    	post (SYSTEM_CONTEXT + "/backup/delete", "application/json", (request, response) -> {
+	    	log.debug("Delete backup: " + request.body());
+        	BackupFilename aFilename = new Gson().fromJson(request.body(), BackupFilename.class);
+        	if(aFilename != null)
+        		bridgeSettings.deleteBackup(aFilename.getFilename());
+        	else
+        		log.warn("No filename given for delete backup.");
+	        return null;
+	    }, new JsonTransformer());
+
+	    // http://ip_address:port/system/backup/restore CORS request
+	    options(SYSTEM_CONTEXT + "/backup/restore", "application/json", (request, response) -> {
+	        response.status(HttpStatus.SC_OK);
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+	        response.header("Access-Control-Allow-Methods", "POST");
+	        response.header("Access-Control-Allow-Headers", request.headers("Access-Control-Request-Headers"));
+	        response.header("Content-Type", "text/html; charset=utf-8");
+	    	return "";
+	    });
+    	post (SYSTEM_CONTEXT + "/backup/restore", "application/json", (request, response) -> {
+	    	log.debug("Restore backup: " + request.body());
+        	BackupFilename aFilename = new Gson().fromJson(request.body(), BackupFilename.class);
+        	if(aFilename != null) {
+        		bridgeSettings.restoreBackup(aFilename.getFilename());
+        		bridgeSettings.loadConfig();
+        	}
+        	else
+        		log.warn("No filename given for restore backup.");
+	        return null;
+	    }, new JsonTransformer());
+    }
+
+    protected void pingListener() {
+        try {
+            byte[] buf = new byte[256];
+            String testData = "M-SEARCH * HTTP/1.1\nHOST: " + Configuration.UPNP_MULTICAST_ADDRESS + ":" + Configuration.UPNP_DISCOVERY_PORT + "ST: urn:schemas-upnp-org:device:CloudProxy:1\nMAN: \"ssdp:discover\"\nMX: 3";
+            buf = testData.getBytes();
+            MulticastSocket socket = new MulticastSocket(Configuration.UPNP_DISCOVERY_PORT);
+
+            InetAddress group = InetAddress.getByName(Configuration.UPNP_MULTICAST_ADDRESS);
+            DatagramPacket packet;
+            packet = new DatagramPacket(buf, buf.length, group, Configuration.UPNP_DISCOVERY_PORT);
+            socket.send(packet);
+
+            socket.close();
+        }
+        catch (IOException e) {
+        	log.warn("Error pinging listener. " + e.getMessage());
+        }
+    }
+    
+    public String reinit() {
+    	bridgeSettings.getBridgeControl().setReinit(true);
+    	pingListener();
+    	return "{\"control\":\"reiniting\"}";
+    }
+    
+    public String stop() {
+    	bridgeSettings.getBridgeControl().setStop(true);
+    	pingListener();
+    	return "{\"control\":\"stopping\"}";    	
+    }
+}

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

@@ -3,23 +3,19 @@ package com.bwssystems.HABridge.dao;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.bwssystems.HABridge.BackupHandler;
 import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.google.gson.stream.JsonReader;
@@ -30,7 +26,7 @@ import java.util.ListIterator;
  * This is an in memory list to manage the configured devices and saves the list as a JSON string to a file for later  
  * loading.
  */
-public class DeviceRepository {
+public class DeviceRepository extends BackupHandler {
 	Map<String, DeviceDescriptor> devices;
     Path repositoryPath;
     final Random random = new Random();
@@ -38,14 +34,16 @@ public class DeviceRepository {
 	
     public DeviceRepository(String deviceDb) {
 		super();
-		_loadRepository(deviceDb);
+		repositoryPath = null;
+		repositoryPath = Paths.get(deviceDb);
+		setupParams(repositoryPath, ".bk", "device.db-");
+		_loadRepository(repositoryPath);
 	}
     
-    private void _loadRepository(String aFilePath){
-		repositoryPath = Paths.get(aFilePath);
-		_loadRepository(repositoryPath);
+    public void loadRepository() {
+    	if(repositoryPath != null)
+    		_loadRepository(repositoryPath);
     }
-    
 	private void _loadRepository(Path aPath){
 		String jsonContent = repositoryReader(aPath);
 		devices = new HashMap<String, DeviceDescriptor>();
@@ -81,78 +79,22 @@ public class DeviceRepository {
         devices.put(id, aDescriptor);
     }
     
-	public void save(DeviceDescriptor aDescriptor) {
-        if(aDescriptor.getId() != null)
-        	devices.remove(aDescriptor.getId());
-        else
-        	aDescriptor.setId(String.valueOf(random.nextInt(Integer.MAX_VALUE)));
-        put(aDescriptor.getId(), aDescriptor);
+	public void save(DeviceDescriptor[] descriptors) {
+		String theNames = "";
+		for(int i = 0; i < descriptors.length; i++) {
+	        if(descriptors[i].getId() != null)
+	        	devices.remove(descriptors[i].getId());
+	        else
+	        	descriptors[i].setId(String.valueOf(random.nextInt(Integer.MAX_VALUE)));
+	        put(descriptors[i].getId(), descriptors[i]);
+	        theNames = theNames + " " + descriptors[i].getName() + ", ";
+		}
     	JsonTransformer aRenderer = new JsonTransformer();
     	String  jsonValue = aRenderer.render(findAll());
         repositoryWriter(jsonValue, repositoryPath);
-        log.debug("Save device: " + aDescriptor.getName());
+        log.debug("Save device(s): " + theNames);
     }
     
-	public String backup(String aFilename) {
-        if(aFilename == null || aFilename.equalsIgnoreCase("")) {
-        	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
-        	aFilename = "devicedb-" + dateFormat.format(Calendar.getInstance().getTime()) + ".bk"; 
-        }
-        else
-        	aFilename = aFilename + ".bk";
-    	try {
-			Files.copy(repositoryPath, FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename), StandardCopyOption.COPY_ATTRIBUTES);
-		} catch (IOException e) {
-			log.error("Could not backup to file: " + aFilename + " message: " + e.getMessage(), e);
-		}
-        log.debug("Backup repository: " + aFilename);
-        return aFilename;
-    }
-
-	public String deleteBackup(String aFilename) {
-        log.debug("Delete backup repository: " + aFilename);
-        try {
-			Files.delete(FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename));
-		} catch (IOException e) {
-			log.error("Could not delete file: " + aFilename + " message: " + e.getMessage(), e);
-		}
-        return aFilename;
-    }
-
-	public String restoreBackup(String aFilename) {
-        log.debug("Restore backup repository: " + aFilename);
-		try {
-			Path target = null;
-			if(Files.exists(repositoryPath)) {
-	        	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
-				target = FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), "devicedb-" + dateFormat.format(Calendar.getInstance().getTime()) + ".bk");
-				Files.move(repositoryPath, target);
-			}
-			Files.copy(FileSystems.getDefault().getPath(repositoryPath.getParent().toString(), aFilename), repositoryPath, StandardCopyOption.COPY_ATTRIBUTES);
-		} catch (IOException e) {
-			log.error("Error restoring the file: " + aFilename + " message: " + e.getMessage(), e);
-			return null;
-		}
-		_loadRepository(repositoryPath);
-        return aFilename;
-    }
-
-	public List<String> getBackups() {
-		List<String> theFilenames = new ArrayList<String>();
-		Path dir = repositoryPath.getParent();
-		try (DirectoryStream<Path> stream =
-		     Files.newDirectoryStream(dir, "*.{bk}")) {
-		    for (Path entry: stream) {
-		        theFilenames.add(entry.getFileName().toString());
-		    }
-		} catch (IOException x) {
-		    // IOException can never be thrown by the iteration.
-		    // In this snippet, it can // only be thrown by newDirectoryStream.
-			log.error("Issue getting direcotyr listing for backups - " + x.getMessage());
-		}
-		return theFilenames;
-	}
-	
 	public String delete(DeviceDescriptor aDescriptor) {
         if (aDescriptor != null) {
         	devices.remove(aDescriptor.getId());

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

@@ -0,0 +1,18 @@
+package com.bwssystems.HABridge.dao;
+
+public class ErrorMessage {
+	private String message;
+
+	public ErrorMessage(String message) {
+		super();
+		this.message = message;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}

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

@@ -15,17 +15,17 @@ import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.JsonTransformer;
-import com.bwssystems.HABridge.Version;
 import com.bwssystems.HABridge.dao.BackupFilename;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.DeviceRepository;
+import com.bwssystems.HABridge.dao.ErrorMessage;
 import com.bwssystems.NestBridge.NestHome;
 import com.bwssystems.harmony.HarmonyHome;
-import com.bwssystems.luupRequests.Sdata;
+import com.bwssystems.luupRequests.Device;
+import com.bwssystems.luupRequests.Scene;
 import com.bwssystems.vera.VeraHome;
-import com.bwssystems.vera.VeraInfo;
 import com.google.gson.Gson;
 
 /**
@@ -37,12 +37,11 @@ public class DeviceResource {
 
     private DeviceRepository deviceRepository;
     private VeraHome veraHome;
-    private Version version;
     private HarmonyHome myHarmonyHome;
     private NestHome nestHome;
     private static final Set<String> supportedVerbs = new HashSet<>(Arrays.asList("get", "put", "post"));
 
-	public DeviceResource(BridgeSettings theSettings, Version theVersion, HarmonyHome theHarmonyHome, NestHome aNestHome) {
+	public DeviceResource(BridgeSettingsDescriptor theSettings, HarmonyHome theHarmonyHome, NestHome aNestHome) {
 		this.deviceRepository = new DeviceRepository(theSettings.getUpnpDeviceDb());
 
 		if(theSettings.isValidVera())
@@ -60,7 +59,6 @@ public class DeviceResource {
 		else
 			this.nestHome = null;
 		
-		this.version = theVersion;
         setupEndpoints();
 	}
 
@@ -80,24 +78,31 @@ public class DeviceResource {
 	    	return "";
 	    });
     	post(API_CONTEXT, "application/json", (request, response) -> {
-	    	log.debug("Create a Device - request body: " + request.body());
-    		DeviceDescriptor device = new Gson().fromJson(request.body(), DeviceDescriptor.class);
-	    	if(device.getContentBody() != null ) {
-	            if (device.getContentType() == null || device.getHttpVerb() == null || !supportedVerbs.contains(device.getHttpVerb().toLowerCase())) {
-	            	device = null;
-	            	response.status(HttpStatus.SC_BAD_REQUEST);
-					log.debug("Bad http verb in create a Device: " + request.body());
-					return device;
-	            }
-	        }
+	    	log.debug("Create a Device(s) - request body: " + request.body());
+	    	DeviceDescriptor devices[];
+	    	if(request.body().substring(0,1).equalsIgnoreCase("[") == true) {
+	    		devices = new Gson().fromJson(request.body(), DeviceDescriptor[].class);
+	    	}
+	    	else {
+	    		devices = new Gson().fromJson("[" + request.body() + "]", DeviceDescriptor[].class);
+	    	}
+	    	for(int i = 0; i < devices.length; i++) {
+		    	if(devices[i].getContentBody() != null ) {
+		            if (devices[i].getContentType() == null || devices[i].getHttpVerb() == null || !supportedVerbs.contains(devices[i].getHttpVerb().toLowerCase())) {
+		            	response.status(HttpStatus.SC_BAD_REQUEST);
+						log.debug("Bad http verb in create a Device(s): " + request.body());
+						return new ErrorMessage("Bad http verb in create a Device(s): " + request.body() + " ");
+		            }
+		        }
+	    	}
 
-	    	deviceRepository.save(device);
-			log.debug("Created a Device: " + request.body());
+	    	deviceRepository.save(devices);
+			log.debug("Created a Device(s): " + request.body());
 
 	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
 			response.status(HttpStatus.SC_CREATED);
 
-            return device;
+            return devices;
 	    }, new JsonTransformer());
 
 	    // http://ip_address:port/api/devices/:id CORS request
@@ -116,6 +121,7 @@ public class DeviceResource {
 	        if(deviceEntry == null){
 		    	log.debug("Could not save an edited Device Id: " + request.params(":id"));
 		    	response.status(HttpStatus.SC_BAD_REQUEST);
+		    	return new ErrorMessage("Could not save an edited Device Id: " + request.params(":id") + " ");
 	        }
 	        else
 	        {
@@ -134,7 +140,9 @@ public class DeviceResource {
 				deviceEntry.setContentBody(device.getContentBody());
 				deviceEntry.setContentBodyOff(device.getContentBodyOff());
 
-				deviceRepository.save(deviceEntry);
+				DeviceDescriptor[] theDevices = new DeviceDescriptor[1];
+				theDevices[0] = deviceEntry;
+				deviceRepository.save(theDevices);
 				response.status(HttpStatus.SC_OK);
 	        }
 	        return deviceEntry;
@@ -153,8 +161,10 @@ public class DeviceResource {
     	get (API_CONTEXT + "/:id", "application/json", (request, response) -> {
 	    	log.debug("Get a device");
 	        DeviceDescriptor descriptor = deviceRepository.findOne(request.params(":id"));
-	        if(descriptor == null)
+	        if(descriptor == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
+				return new ErrorMessage("Could not find, id: " + request.params(":id") + " ");
+	        }
 	        else
 	        	response.status(HttpStatus.SC_OK);
 	        return descriptor;
@@ -164,8 +174,10 @@ public class DeviceResource {
     		String anId = request.params(":id");
 	    	log.debug("Delete a device: " + anId);
 	        DeviceDescriptor deleted = deviceRepository.findOne(anId);
-	        if(deleted == null)
+	        if(deleted == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
+				return new ErrorMessage("Could not delete, id: " + anId + " not found. ");
+	        }
 	        else
 	        {
 	        	deviceRepository.delete(deleted);
@@ -174,38 +186,43 @@ public class DeviceResource {
 	        return null;
 	    }, new JsonTransformer());
 
-    	get (API_CONTEXT + "/habridge/version", "application/json", (request, response) -> {
-	    	log.debug("Get HA Bridge version: v" + version.getVersion());
-			response.status(HttpStatus.SC_OK);
-	        return "{\"version\":\"" + version.getVersion() + "\"}";
-	    });
-
     	get (API_CONTEXT + "/vera/devices", "application/json", (request, response) -> {
 	    	log.debug("Get vera devices");
 	        if(veraHome == null){
 				response.status(HttpStatus.SC_NOT_FOUND);
-				return null;
+				return new ErrorMessage("A Vera is not available.");
 	        }
-
-	      	response.status(HttpStatus.SC_OK);
-	        return veraHome.getDevices();
+	        List<Device> theDevices = veraHome.getDevices();
+	        if(theDevices == null) {
+	        	response.status(HttpStatus.SC_SERVICE_UNAVAILABLE);
+	        	return new ErrorMessage("A Vera request failed to get devices. Check your Vera IP addresses.");
+	        }
+	        else
+	        	response.status(HttpStatus.SC_OK);
+	        return theDevices;
 	    }, new JsonTransformer());
 
     	get (API_CONTEXT + "/vera/scenes", "application/json", (request, response) -> {
 	    	log.debug("Get vera scenes");
 	        if(veraHome == null){
 				response.status(HttpStatus.SC_NOT_FOUND);
-	            return null;
+				return new ErrorMessage("A Vera is not available.");
 	        }
-	      	response.status(HttpStatus.SC_OK);
-	        return veraHome.getScenes();
+	        List<Scene> theScenes = veraHome.getScenes();
+	        if(theScenes == null) {
+	        	response.status(HttpStatus.SC_SERVICE_UNAVAILABLE);
+	        	return new ErrorMessage("A Vera is not available and failed to get scenes. Check your Vera IP addresses.");
+	        }
+	        else
+	        	response.status(HttpStatus.SC_OK);
+	        return theScenes;
 	    }, new JsonTransformer());
 
     	get (API_CONTEXT + "/harmony/activities", "application/json", (request, response) -> {
 	    	log.debug("Get harmony activities");
 	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
-		      	return null;	      		
+				return new ErrorMessage("A Harmony is not available.");	      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
 	      	return myHarmonyHome.getActivities();
@@ -215,7 +232,7 @@ public class DeviceResource {
 	    	log.debug("Get harmony current activity");
 	      	if(myHarmonyHome == null) {
 	      		response.status(HttpStatus.SC_NOT_FOUND);
-	      		return null;
+	      		return new ErrorMessage("A Harmony is not available.");	
 	      	}
 	      	response.status(HttpStatus.SC_OK);
       		return myHarmonyHome.getCurrentActivities();
@@ -225,7 +242,7 @@ public class DeviceResource {
 	    	log.debug("Get harmony devices");
 	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
-		      	return null;	      		
+				return new ErrorMessage("A Harmony is not available.");		      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
 	      	return myHarmonyHome.getDevices();
@@ -235,7 +252,7 @@ public class DeviceResource {
 	    	log.debug("Get nest items");
 	      	if(nestHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
-		      	return null;	      		
+				return new ErrorMessage("A Nest is not available.");
 	      	}
 	      	response.status(HttpStatus.SC_OK);
 	      	return nestHome.getItems();
@@ -295,8 +312,10 @@ public class DeviceResource {
     	post (API_CONTEXT + "/backup/restore", "application/json", (request, response) -> {
 	    	log.debug("Restore backup: " + request.body());
         	BackupFilename aFilename = new Gson().fromJson(request.body(), BackupFilename.class);
-        	if(aFilename != null)
+        	if(aFilename != null) {
         		deviceRepository.restoreBackup(aFilename.getFilename());
+        		deviceRepository.loadRepository();
+        	}
         	else
         		log.warn("No filename given for restore backup.");
 	        return null;

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

@@ -1,6 +1,6 @@
 package com.bwssystems.HABridge.hue;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.api.UserCreateRequest;
 import com.bwssystems.HABridge.api.hue.DeviceResponse;
@@ -69,11 +69,11 @@ public class HueMulator {
     private Nest theNest;
     private HttpClient httpClient;
     private ObjectMapper mapper;
-    private BridgeSettings bridgeSettings;
+    private BridgeSettingsDescriptor bridgeSettings;
     private byte[] sendData;
 
 
-    public HueMulator(BridgeSettings theBridgeSettings, DeviceRepository aDeviceRepository, HarmonyHome theHarmonyHome, NestHome aNestHome){
+    public HueMulator(BridgeSettingsDescriptor theBridgeSettings, DeviceRepository aDeviceRepository, HarmonyHome theHarmonyHome, NestHome aNestHome){
         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);
@@ -245,7 +245,7 @@ public class HueMulator {
 	        DeviceDescriptor device = repository.findOne(lightId);
 	        if (device == null) {
 	        	response.status(HttpStatus.SC_NOT_FOUND);
-	            return null;
+	            return "[{\"error\":{\"type\": 3, \"address\": \"/lights/" + lightId + "\",\"description\": \"Object not found\"}}]";
 	        } else {
 	            log.debug("found device named: " + device.getName());
 	        }
@@ -285,14 +285,14 @@ public class HueMulator {
 	            state = mapper.readValue(request.body(), DeviceState.class);
 	        } catch (IOException e) {
 	        	log.warn("Object mapper barfed on input of body.", e);
-        		responseString = "[{\"error\":{\"type\": 2, \"address\": \"/lights/" + lightId + ",\"description\": \"Object mapper barfed on input of body.\"}}]";
+        		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) {
 	        	log.warn("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 + "\"}}]";
+        		responseString = "[{\"error\":{\"type\": 3, \"address\": \"/lights/" + lightId + "\",\"description\": \"Could not find device\", \"resource\": \"/lights/" + lightId + "\"}}]";
     	        return responseString;
 	        }
 	
@@ -322,60 +322,77 @@ public class HueMulator {
 	        if(device.getDeviceType().toLowerCase().contains("activity") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("harmonyActivity")))
 	        {
 	        	log.debug("executing HUE api request to change activity to Harmony: " + url);
-	        	RunActivity anActivity = new Gson().fromJson(url, RunActivity.class);
-	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
-	        	if(myHarmony == null)
+	        	if(myHarmonyHome != null)
 	        	{
-	        		log.warn("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\"}}]";
+		        	RunActivity anActivity = new Gson().fromJson(url, RunActivity.class);
+		        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+		        	if(myHarmony == null)
+		        	{
+		        		log.warn("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 {
+	        		log.warn("Should not get here, no harmony configured");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Should not get here, no harmony configured\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        		
 	        	}
-	        	else
-	        		myHarmony.startActivity(anActivity);
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("button") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("harmonyButton")))
 	        {
 	        	log.debug("executing HUE api request to button press(es) to Harmony: " + url);
-	        	if(url.substring(0, 1).equalsIgnoreCase("{")) {
-	        		url = "[" + url +"]";
-	        	}
-	        	ButtonPress[] deviceButtons = new Gson().fromJson(url, ButtonPress[].class);
-	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
-	        	if(myHarmony == null)
+	        	if(myHarmonyHome != null)
 	        	{
-	        		log.warn("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\"}}]";
+		        	if(url.substring(0, 1).equalsIgnoreCase("{")) {
+		        		url = "[" + url +"]";
+		        	}
+		        	ButtonPress[] deviceButtons = new Gson().fromJson(url, ButtonPress[].class);
+		        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+		        	if(myHarmony == null)
+		        	{
+		        		log.warn("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 {
+		        		for(int i = 0; i < deviceButtons.length; i++) {
+		        			if( i > 0)
+		        				Thread.sleep(bridgeSettings.getButtonsleep());
+		    	        	log.debug("pressing button: " + deviceButtons[i].getDevice() + " - " + deviceButtons[i].getButton() + " - iteration: " + String.valueOf(i));
+		        			myHarmony.pressButton(deviceButtons[i]);
+		        		}
+		        	}
 	        	}
 	        	else {
-	        		for(int i = 0; i < deviceButtons.length; i++) {
-	        			if( i > 0)
-	        				Thread.sleep(bridgeSettings.getButtonsleep());
-	    	        	log.debug("pressing button: " + deviceButtons[i].getDevice() + " - " + deviceButtons[i].getButton() + " - iteration: " + String.valueOf(i));
-	        			myHarmony.pressButton(deviceButtons[i]);
-	        		}
+	        		log.warn("Should not get here, no harmony configured");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Should not get here, no harmony configured\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        		
 	        	}
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("home") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("nestHomeAway")))
 	        {
 	        	log.debug("executing HUE api request to set away for nest home: " + url);
-	        	NestInstruction homeAway = new Gson().fromJson(url, NestInstruction.class);
 	        	if(theNest == null)
 	        	{
 	        		log.warn("Should not get here, no Nest available");
-	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no Nest available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Should not get here, no Nest available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 	        	}
-	        	else
+	        	else {
+		        	NestInstruction homeAway = new Gson().fromJson(url, NestInstruction.class);
 	        		theNest.getHome(homeAway.getName()).setAway(homeAway.getAway());
+	        	}
 	        }
 	        else if(device.getDeviceType().toLowerCase().contains("thermo") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("nestThermoSet")))
 	        {
 	        	log.debug("executing HUE api request to set thermostat for nest: " + url);
-	        	NestInstruction thermoSetting = new Gson().fromJson(url, NestInstruction.class);
 	        	if(theNest == null)
 	        	{
 	        		log.warn("Should not get here, no Nest available");
-	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no Nest available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Should not get here, no Nest available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 	        	}
 	        	else {
+		        	NestInstruction thermoSetting = new Gson().fromJson(url, NestInstruction.class);
 	        		if(thermoSetting.getControl().equalsIgnoreCase("temp")) {
 	        			if(request.body().contains("bri")) {
 	        				thermoSetting.setTemp(String.valueOf((Double.parseDouble(replaceIntensityValue(thermoSetting.getTemp(), state.getBri())) - 32.0)/1.8));
@@ -393,7 +410,7 @@ public class HueMulator {
 	        		}
 	        		else {
 		        		log.warn("no valid Nest control info: " + thermoSetting.getControl());
-		        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"no valid Nest control info\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+		        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"no valid Nest control info\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 	        		}
 	        	}
 	        }
@@ -417,7 +434,7 @@ public class HueMulator {
 	        		responseSocket.close();
 	    		}  catch (IOException e) {
 	    			log.warn("Could not send UDP Datagram packet for request.", e);
-	    			responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Error on calling out to device\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	    			responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Error on calling out to device\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 	    		}
 	        }
 	        else
@@ -433,7 +450,7 @@ public class HueMulator {
 				// make call
 				if (!doHttpRequest(url, device.getHttpVerb(), device.getContentType(), body)) {
 					log.warn("Error on calling url to change device state: " + url);
-					responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Error on calling url to change device state\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+					responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Error on calling url to change device state\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 				}
 	        }
 	

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

@@ -3,7 +3,9 @@ package com.bwssystems.HABridge.upnp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeControlDescriptor;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
+import com.bwssystems.HABridge.Configuration;
 
 import java.io.IOException;
 import java.net.*;
@@ -14,34 +16,29 @@ import org.apache.http.conn.util.*;
 
 public class UpnpListener {
 	private Logger log = LoggerFactory.getLogger(UpnpListener.class);
-	private static final int UPNP_DISCOVERY_PORT = 1900;
-	private static final String UPNP_MULTICAST_ADDRESS = "239.255.255.250";
-
 	private int upnpResponsePort;
-
 	private int httpServerPort;
-
 	private String responseAddress;
-	
 	private boolean strict;
-	
 	private boolean traceupnp;
+	private BridgeControlDescriptor bridgeControl;
 	
-	public UpnpListener(BridgeSettings theSettings) {
+	public UpnpListener(BridgeSettingsDescriptor theSettings, BridgeControlDescriptor theControl) {
 		super();
-		upnpResponsePort = Integer.valueOf(theSettings.getUpnpResponsePort());
+		upnpResponsePort = theSettings.getUpnpResponsePort();
 		httpServerPort = Integer.valueOf(theSettings.getServerPort());
 		responseAddress = theSettings.getUpnpConfigAddress();
 		strict = theSettings.isUpnpStrict();
 		traceupnp = theSettings.isTraceupnp();
+		bridgeControl = theControl;
 	}
 
-	public void startListening(){
+	public boolean startListening(){
 		log.info("UPNP Discovery Listener starting....");
 
 		try (DatagramSocket responseSocket = new DatagramSocket(upnpResponsePort);
-				MulticastSocket upnpMulticastSocket  = new MulticastSocket(UPNP_DISCOVERY_PORT);) {
-			InetSocketAddress socketAddress = new InetSocketAddress(UPNP_MULTICAST_ADDRESS, UPNP_DISCOVERY_PORT);
+				MulticastSocket upnpMulticastSocket  = new MulticastSocket(Configuration.UPNP_DISCOVERY_PORT);) {
+			InetSocketAddress socketAddress = new InetSocketAddress(Configuration.UPNP_MULTICAST_ADDRESS, Configuration.UPNP_DISCOVERY_PORT);
 			Enumeration<NetworkInterface> ifs =	NetworkInterface.getNetworkInterfaces();
 
 			while (ifs.hasMoreElements()) {
@@ -71,22 +68,35 @@ public class UpnpListener {
 			}
 
 			log.info("UPNP Discovery Listener running and ready....");
-
-			while(true){ //trigger shutdown here
+			boolean loopControl = true;
+			while(loopControl){ //trigger shutdown here
 				byte[] buf = new byte[1024];
 				DatagramPacket packet = new DatagramPacket(buf, buf.length);
 				upnpMulticastSocket.receive(packet);
 				if(isSSDPDiscovery(packet)){
 					sendUpnpResponse(responseSocket, packet.getAddress(), packet.getPort());
 				}
+				if(bridgeControl.isReinit() || bridgeControl.isStop()) {
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException e) {
+						// noop
+					}
+					loopControl = false;
+				}
 			}
-
+			upnpMulticastSocket.close();
+			responseSocket.close();
 		}  catch (IOException e) {
 			log.error("UpnpListener encountered an error opening sockets. Shutting down", e);
-
 		}
-		log.info("UPNP Discovery Listener Stopped");
-
+		if(bridgeControl.isReinit())
+			log.info("UPNP Discovery Listener - ended, restart found");
+		if(bridgeControl.isStop())
+			log.info("UPNP Discovery Listener - ended, stop found");
+		if(!bridgeControl.isStop()&& !bridgeControl.isReinit())
+			log.info("UPNP Discovery Listener - ended, error found");
+		return bridgeControl.isReinit();
 	}
 
 	/**

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

@@ -3,8 +3,7 @@ package com.bwssystems.HABridge.upnp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
-import com.bwssystems.HABridge.JsonTransformer;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 
 import static spark.Spark.get;
 
@@ -12,11 +11,9 @@ import static spark.Spark.get;
  * 
  */
 public class UpnpSettingsResource {
-    private static final String UPNP_CONTEXT = "/upnp";
-
     private Logger log = LoggerFactory.getLogger(UpnpSettingsResource.class);
     
-    private BridgeSettings theSettings;
+    private BridgeSettingsDescriptor theSettings;
 
 	private String hueTemplate = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">\n"
 			+ "<specVersion>\n" + "<major>1</major>\n" + "<minor>0</minor>\n" + "</specVersion>\n"
@@ -40,20 +37,9 @@ public class UpnpSettingsResource {
 			+ "<depth>24</depth>\n" + "<url>hue_logo_3.png</url>\n" + "</icon>\n" + "</iconList>\n" + "</device>\n"
 			+ "</root>\n";
 
-	public UpnpSettingsResource(BridgeSettings theBridgeSettings) {
+	public UpnpSettingsResource(BridgeSettingsDescriptor theBridgeSettings) {
 		super();
-		this.theSettings = new BridgeSettings();
-		this.theSettings.setDevMode(theBridgeSettings.isDevMode());
-		this.theSettings.setHarmonyAddress(theBridgeSettings.getHarmonyAddress());
-		this.theSettings.setServerPort(theBridgeSettings.getServerPort());
-		this.theSettings.setTraceupnp(theBridgeSettings.isTraceupnp());
-		this.theSettings.setUpnpConfigAddress(theBridgeSettings.getUpnpConfigAddress());
-		this.theSettings.setUpnpDeviceDb(theBridgeSettings.getUpnpDeviceDb());
-		this.theSettings.setButtonsleep(theBridgeSettings.getButtonsleep());
-		this.theSettings.setUpnpResponsePort(theBridgeSettings.getUpnpResponsePort());
-		this.theSettings.setUpnpStrict(theBridgeSettings.isUpnpStrict());
-		this.theSettings.setVeraAddress(theBridgeSettings.getVeraAddress());
-		this.theSettings.setNestConfigured(theBridgeSettings.isValidNest());
+		this.theSettings = theBridgeSettings;
 	}
 
 	public void setupServer() {
@@ -86,14 +72,5 @@ public class UpnpSettingsResource {
 
             return filledTemplate;
         } );
-
-//      http://ip_address:port/upnp/settings which returns the bridge configuration settings
-		get(UPNP_CONTEXT + "/settings", "application/json", (request, response) -> {
-			log.debug("bridge settings requested from " + request.ip());
-
-			response.status(200);
-
-            return theSettings;
-        }, new JsonTransformer());
 	}
 }

src/main/java/com/bwssystems/NestBridge/NestHome.java

@@ -8,7 +8,7 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.nest.controller.Home;
 import com.bwssystems.nest.controller.Nest;
 import com.bwssystems.nest.controller.NestSession;
@@ -23,13 +23,13 @@ public class NestHome {
     private Nest theNest;
     private ArrayList<NestItem> nestItems;
     
-	public NestHome(BridgeSettings bridgeSettings) {
+	public NestHome(BridgeSettingsDescriptor bridgeSettings) {
         theSession = null;
         theNest = null;
         nestItems = null;
         
         if(!bridgeSettings.isValidNest()) {
-        	log.info("not a valid nest");
+        	log.debug("not a valid nest");
         	return;
         }
 
@@ -97,5 +97,14 @@ public class NestHome {
 	public Nest getTheNest() {
 		return theNest;
 	}
+	
+	public void closeTheNest() {
+		if(theSession != null) {
+			theNest.endNestSession();
+			theNest = null;
+			theSession = null;
+			nestItems = null;
+		}
+	}
 }
 

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

@@ -119,4 +119,14 @@ public class HarmonyHandler {
 
 		return true;
 	}
+
+	public void shutdown() {
+		log.debug("Harmony api shutdown requested.");
+        if(devMode)
+        	return;
+        
+		harmonyClient.disconnect();
+		harmonyClient = null;
+	}
+
 }

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

@@ -10,7 +10,7 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.IpList;
 import com.bwssystems.HABridge.NamedIP;
 
@@ -20,13 +20,15 @@ import net.whistlingfish.harmony.config.Device;
 public class HarmonyHome {
     private static final Logger log = LoggerFactory.getLogger(HarmonyHome.class);
 	private Map<String, HarmonyServer> hubs;
+	private Boolean isDevMode;
 
-	public HarmonyHome(BridgeSettings bridgeSettings) {
+	public HarmonyHome(BridgeSettingsDescriptor bridgeSettings) {
 		super();
+        isDevMode = Boolean.parseBoolean(System.getProperty("dev.mode", "false"));
 		hubs = new HashMap<String, HarmonyServer>();
-		if(!bridgeSettings.isValidHarmony() && !bridgeSettings.isDevMode())
+		if(!bridgeSettings.isValidHarmony() && !isDevMode)
 			return;
-		if(bridgeSettings.isDevMode()) {
+		if(isDevMode) {
 			NamedIP devModeIp = new NamedIP();
 			devModeIp.setIp("10.10.10.10");
 			devModeIp.setName("devMode");
@@ -40,7 +42,7 @@ public class HarmonyHome {
 		while(theList.hasNext()) {
 			NamedIP aHub = theList.next();
 	      	try {
-	      		hubs.put(aHub.getName(), HarmonyServer.setup(bridgeSettings, aHub));
+	      		hubs.put(aHub.getName(), HarmonyServer.setup(bridgeSettings, isDevMode, aHub));
 			} catch (Exception e) {
 		        log.error("Cannot get harmony client (" + aHub.getName() + ") setup, Exiting with message: " + e.getMessage(), e);
 		        return;
@@ -48,6 +50,16 @@ public class HarmonyHome {
 		}
 	}
 
+	public void shutdownHarmonyHubs() {
+		if(isDevMode)
+			return;
+		Iterator<String> keys = hubs.keySet().iterator();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			hubs.get(key).getMyHarmony().shutdown();
+		}
+	}
+
 	public HarmonyHandler getHarmonyHandler(String aName) {
 		HarmonyHandler aHandler = null;
 		if(aName == null || aName.equals("")) {

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

@@ -7,7 +7,7 @@ import javax.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.NamedIP;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -26,7 +26,7 @@ public class HarmonyServer {
     private DevModeResponse devResponse;
     private OAReplyProvider dummyProvider;
     private NamedIP myNameAndIP;
-    
+    private Boolean isDevMode;
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
 	public HarmonyServer(NamedIP theHarmonyAddress) {
@@ -34,33 +34,35 @@ public class HarmonyServer {
 		myHarmony = null;
 		dummyProvider = null;
 		myNameAndIP = theHarmonyAddress;
+		isDevMode = false;
 	}
 
-	public static HarmonyServer setup(BridgeSettings bridgeSettings, NamedIP theHarmonyAddress) throws Exception {
-		if(!bridgeSettings.isValidHarmony() && !bridgeSettings.isDevMode()) {
+	public static HarmonyServer setup(BridgeSettingsDescriptor bridgeSettings, Boolean harmonyDevMode, NamedIP theHarmonyAddress) throws Exception {
+		if(!bridgeSettings.isValidHarmony() && harmonyDevMode) {
 			return new HarmonyServer(theHarmonyAddress);
 		}
     	Injector injector = null;
-    	if(!bridgeSettings.isDevMode())
+    	if(!harmonyDevMode)
     		injector = Guice.createInjector(new HarmonyClientModule());
         HarmonyServer mainObject = new HarmonyServer(theHarmonyAddress);
-    	if(!bridgeSettings.isDevMode())
+    	if(!harmonyDevMode)
     		injector.injectMembers(mainObject);
-  		mainObject.execute(bridgeSettings);
+  		mainObject.execute(bridgeSettings, harmonyDevMode);
   		return mainObject;
   	}
 
-	private void execute(BridgeSettings mySettings) throws Exception {
+	private void execute(BridgeSettingsDescriptor mySettings, Boolean harmonyDevMode) throws Exception {
         Boolean noopCalls = Boolean.parseBoolean(System.getProperty("noop.calls", "false"));
-        String modeString = "";
+		isDevMode = harmonyDevMode;
+       String modeString = "";
         if(dummyProvider != null)
         	log.debug("something is very wrong as dummyProvider is not null...");
-        if(mySettings.isDevMode())
+        if(isDevMode)
         	modeString = " (development mode)";
         else if(noopCalls)
         	modeString = " (no op calls to harmony)";
 		log.info("setup initiated " + modeString + "....");
-        if(mySettings.isDevMode())
+        if(isDevMode)
         {
         	harmonyClient = null;
         	devResponse = new DevModeResponse();

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

@@ -9,16 +9,17 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.NamedIP;
 import com.bwssystems.luupRequests.Device;
 import com.bwssystems.luupRequests.Scene;
+import com.bwssystems.luupRequests.Sdata;
 
 public class VeraHome {
     private static final Logger log = LoggerFactory.getLogger(VeraHome.class);
 	private Map<String, VeraInfo> veras;
 	
-	public VeraHome(BridgeSettings bridgeSettings) {
+	public VeraHome(BridgeSettingsDescriptor bridgeSettings) {
 		veras = new HashMap<String, VeraInfo>();
 		if(!bridgeSettings.isValidVera())
 			return;
@@ -35,9 +36,16 @@ public class VeraHome {
 		ArrayList<Device> deviceList = new ArrayList<Device>();
 		while(keys.hasNext()) {
 			String key = keys.next();
-			Iterator<Device> devices = veras.get(key).getSdata().getDevices().iterator();
-			while(devices.hasNext()) {
-				deviceList.add(devices.next());
+			Sdata theSdata = veras.get(key).getSdata();
+			if(theSdata != null) {
+				Iterator<Device> devices = theSdata.getDevices().iterator();
+				while(devices.hasNext()) {
+					deviceList.add(devices.next());
+				}
+			}
+			else {
+				deviceList = null;
+				break;
 			}
 		}
 		return deviceList;
@@ -48,9 +56,16 @@ public class VeraHome {
 		ArrayList<Scene> sceneList = new ArrayList<Scene>();
 		while(keys.hasNext()) {
 			String key = keys.next();
-			Iterator<Scene> scenes = veras.get(key).getSdata().getScenes().iterator();
-			while(scenes.hasNext()) {
-				sceneList.add(scenes.next());
+			Sdata theSdata = veras.get(key).getSdata();
+			if(theSdata != null) {
+				Iterator<Scene> scenes = theSdata.getScenes().iterator();
+				while(scenes.hasNext()) {
+					sceneList.add(scenes.next());
+				}
+			}
+			else {
+				sceneList = null;
+				break;
 			}
 		}
 		return sceneList;

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

@@ -37,16 +37,19 @@ public class VeraInfo {
 	}
     
 	public Sdata getSdata() {
+    	Sdata theSdata = null;
 		if(!validVera)
-			return new Sdata();
+			return theSdata;
 
 		String theUrl = "http://" + veraAddress.getIp() + SDATA_REQUEST;
     	String theData;
     	
     	theData = doHttpGETRequest(theUrl);
-    	Sdata theSdata = new Gson().fromJson(theData, Sdata.class);
-        log.debug("GET sdata - full: " + theSdata.getFull() + ", version: " + theSdata.getVersion());
-        denormalizeSdata(theSdata);
+    	if(theData != null) {
+	    	theSdata = new Gson().fromJson(theData, Sdata.class);
+	        log.debug("GET sdata - full: " + theSdata.getFull() + ", version: " + theSdata.getVersion());
+	        denormalizeSdata(theSdata);
+    	}
     	return theSdata;
     }
 	
@@ -91,19 +94,19 @@ public class VeraInfo {
 
 	//	This function executes the url against the vera
     protected String doHttpGETRequest(String url) {
+    	String theContent = null;
         log.debug("calling GET on URL: " + url);
         HttpGet httpGet = new HttpGet(url);
         try {
             HttpResponse response = httpClient.execute(httpGet);
-            String theContent = EntityUtils.toString(response.getEntity()); //read content for data
-            EntityUtils.consume(response.getEntity()); //close out inputstream ignore content
             log.debug("GET on URL responded: " + response.getStatusLine().getStatusCode());
             if(response.getStatusLine().getStatusCode() == 200){
-                return theContent;
+                theContent = EntityUtils.toString(response.getEntity()); //read content for data
+                EntityUtils.consume(response.getEntity()); //close out inputstream ignore content
             }
         } catch (IOException e) {
-            log.error("Error calling out to HA gateway", e);
+            log.error("doHttpGETRequest: Error calling out to HA gateway: " + e.getMessage());
         }
-        return null;
+        return theContent;
     }
 }

src/main/resources/public/css/ngDialog-theme-default.min.css

@@ -0,0 +1 @@
+@-webkit-keyframes ngdialog-flyin{0%{opacity:0;-webkit-transform:translateY(-40px);transform:translateY(-40px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes ngdialog-flyin{0%{opacity:0;-webkit-transform:translateY(-40px);transform:translateY(-40px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@-webkit-keyframes ngdialog-flyout{0%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-webkit-transform:translateY(-40px);transform:translateY(-40px)}}@keyframes ngdialog-flyout{0%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-webkit-transform:translateY(-40px);transform:translateY(-40px)}}.ngdialog.ngdialog-theme-default{padding-bottom:160px;padding-top:160px}.ngdialog.ngdialog-theme-default.ngdialog-closing .ngdialog-content{-webkit-animation:ngdialog-flyout .5s;animation:ngdialog-flyout .5s}.ngdialog.ngdialog-theme-default .ngdialog-content{-webkit-animation:ngdialog-flyin .5s;animation:ngdialog-flyin .5s;background:#f0f0f0;border-radius:5px;color:#444;font-family:Helvetica,sans-serif;font-size:1.1em;line-height:1.5em;margin:0 auto;max-width:100%;padding:1em;position:relative;width:450px}.ngdialog.ngdialog-theme-default .ngdialog-close{border-radius:5px;cursor:pointer;position:absolute;right:0;top:0}.ngdialog.ngdialog-theme-default .ngdialog-close:before{background:0 0;border-radius:3px;color:#bbb;content:'\00D7';font-size:26px;font-weight:400;height:30px;line-height:26px;position:absolute;right:3px;text-align:center;top:3px;width:30px}.ngdialog.ngdialog-theme-default .ngdialog-close:active:before,.ngdialog.ngdialog-theme-default .ngdialog-close:hover:before{color:#777}.ngdialog.ngdialog-theme-default .ngdialog-message{margin-bottom:.5em}.ngdialog.ngdialog-theme-default .ngdialog-input{margin-bottom:1em}.ngdialog.ngdialog-theme-default .ngdialog-input input[type=text],.ngdialog.ngdialog-theme-default .ngdialog-input input[type=password],.ngdialog.ngdialog-theme-default .ngdialog-input input[type=email],.ngdialog.ngdialog-theme-default .ngdialog-input input[type=url],.ngdialog.ngdialog-theme-default .ngdialog-input textarea{background:#fff;border:0;border-radius:3px;font-family:inherit;font-size:inherit;font-weight:inherit;margin:0 0 .25em;min-height:2.5em;padding:.25em .67em;width:100%}.ngdialog.ngdialog-theme-default .ngdialog-input input[type=text]:focus,.ngdialog.ngdialog-theme-default .ngdialog-input input[type=password]:focus,.ngdialog.ngdialog-theme-default .ngdialog-input input[type=email]:focus,.ngdialog.ngdialog-theme-default .ngdialog-input input[type=url]:focus,.ngdialog.ngdialog-theme-default .ngdialog-input textarea:focus{box-shadow:inset 0 0 0 2px #8dbdf1;outline:0}.ngdialog.ngdialog-theme-default .ngdialog-buttons:after{content:'';display:table;clear:both}.ngdialog.ngdialog-theme-default .ngdialog-button{border:0;border-radius:3px;cursor:pointer;float:right;font-family:inherit;font-size:.8em;letter-spacing:.1em;line-height:1em;margin:0 0 0 .5em;padding:.75em 2em;text-transform:uppercase}.ngdialog.ngdialog-theme-default .ngdialog-button:focus{-webkit-animation:ngdialog-pulse 1.1s infinite;animation:ngdialog-pulse 1.1s infinite;outline:0}@media (max-width:568px){.ngdialog.ngdialog-theme-default .ngdialog-button:focus{-webkit-animation:none;animation:none}}.ngdialog.ngdialog-theme-default .ngdialog-button.ngdialog-button-primary{background:#3288e6;color:#fff}.ngdialog.ngdialog-theme-default .ngdialog-button.ngdialog-button-secondary{background:#e0e0e0;color:#777}

src/main/resources/public/css/ngDialog.min.css

@@ -0,0 +1 @@
+.ngdialog,.ngdialog-overlay{position:fixed;top:0;right:0;bottom:0;left:0}@-webkit-keyframes ngdialog-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes ngdialog-fadeout{0%{opacity:1}100%{opacity:0}}@-webkit-keyframes ngdialog-fadein{0%{opacity:0}100%{opacity:1}}@keyframes ngdialog-fadein{0%{opacity:0}100%{opacity:1}}.ngdialog{box-sizing:border-box;overflow:auto;-webkit-overflow-scrolling:touch;z-index:10000}.ngdialog *,.ngdialog :after,.ngdialog :before{box-sizing:inherit}.ngdialog.ngdialog-disabled-animation,.ngdialog.ngdialog-disabled-animation .ngdialog-content,.ngdialog.ngdialog-disabled-animation .ngdialog-overlay{-webkit-animation:none!important;animation:none!important}.ngdialog-overlay{background:rgba(0,0,0,.4);-webkit-backface-visibility:hidden;-webkit-animation:ngdialog-fadein .5s;animation:ngdialog-fadein .5s}.ngdialog-no-overlay{pointer-events:none}.ngdialog.ngdialog-closing .ngdialog-overlay{-webkit-backface-visibility:hidden;-webkit-animation:ngdialog-fadeout .5s;animation:ngdialog-fadeout .5s}.ngdialog-content{background:#fff;-webkit-backface-visibility:hidden;-webkit-animation:ngdialog-fadein .5s;animation:ngdialog-fadein .5s;pointer-events:all}.ngdialog.ngdialog-closing .ngdialog-content{-webkit-backface-visibility:hidden;-webkit-animation:ngdialog-fadeout .5s;animation:ngdialog-fadeout .5s}.ngdialog-close:before{font-family:Helvetica,Arial,sans-serif;content:'\00D7';cursor:pointer}body.ngdialog-open,html.ngdialog-open{overflow:hidden}

src/main/resources/public/css/rzslider.min.css

@@ -0,0 +1,2 @@
+/*! angularjs-slider - v2.8.0 -  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> -  https://github.com/angular-slider/angularjs-slider -  2016-02-08 */
+rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}rzslider[disabled]{cursor:not-allowed}rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider .rz-base{width:100%;height:100%;padding:0}rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}rzslider .rz-bar-wrapper.rz-draggable{cursor:move}rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider .rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider .rz-pointer:hover:after{background-color:#fff}rzslider .rz-pointer.rz-active{z-index:4}rzslider .rz-pointer.rz-active:after{background-color:#451aff}rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}rzslider .rz-bubble.rz-selection{top:16px}rzslider .rz-bubble.rz-limit{color:#55637d}rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:0;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}rzslider .rz-ticks .tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}rzslider .rz-ticks .tick.selected{background:#0db9f0}rzslider .rz-ticks .tick .tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}rzslider.vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}rzslider.vertical .rz-base{width:100%;height:100%;padding:0}rzslider.vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}rzslider.vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}rzslider.vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}rzslider.vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}rzslider.vertical .rz-bubble.rz-selection{top:auto;left:16px!important}rzslider.vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%;padding:11px 0;-webkit-flex-direction:column-reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}rzslider.vertical .rz-ticks .tick{vertical-align:middle}rzslider.vertical .rz-ticks .tick .tick-value{top:auto;right:-30px;transform:translate(0,-28%)}

src/main/resources/public/index.html

@@ -7,7 +7,11 @@
     <title>HA Bridge</title>
     <link href="css/main.css" rel="stylesheet">
     <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/bootstrap-theme.min.css" rel="stylesheet">
 	<link href="css/ngToast.min.css" rel="stylesheet">
+	<link href="css/rzslider.min.css" rel="stylesheet">
+	<link href="css/ngDialog.min.css" rel="stylesheet">
+	<link href="css/ngDialog-theme-default.min.css" rel="stylesheet">
 
     <!--[if lt IE 9]>
     <script type="text/javascript" src="js/html5shiv.min.js"></script>
@@ -20,10 +24,11 @@
 	<nav class="navbar navbar-inverse navbar-fixed-top">
 		<div class="container" ng-controller="VersionController">
 			<div class="navbar-header">
-				<button type="button" class="navbar-toggle">
+				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
 					<span class="sr-only">Toggle navigation</span>
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
 				</button>
 				<a class="navbar-brand" href="#">HA Bridge</a>
 			</div>
@@ -33,10 +38,8 @@
 					<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"
-						aria-expanded="false">About <span class="caret"></span></a>
-						<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+						<a id="dLabel" href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About <span class="caret"></span></a>
+						<ul class="dropdown-menu" aria-labelledby="dLabel">
 							<li><a href="http://www.bwssystems.com" target="_blank">Developed by BWS Systems</a></li>
 							<li><a href="http://www.amazon.com/echo" target="_blank">Amazon Echo</a></li>
 							<li><a href="">HA Bridge Version {{bridge.habridgeversion}}</a></li>
@@ -52,13 +55,14 @@
 	
 	</div>
 
-
     <script src="js/jquery-1.11.3.min.js"></script>
     <script src="js/angular.min.js"></script>
     <script src="js/angular-route.min.js"></script>
 	<script src="js/angular-sanitize.min.js"></script>
 	<script src="js/ngToast.min.js"></script>
-    <script src="js/bootstrap.min.js"></script>
+	<script src="js/rzslider.min.js"></script>
+	<script src="js/rzslider.min.js"></script>
+    <script src="js/ngDialog.min.js"></script>
     <script src="scripts/app.js"></script>
 </body>
 </html>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation" class="active"><a href="#">Configuration</a></li>
+        <li role="presentation" class="active"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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>
@@ -8,20 +9,6 @@
         <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 ({{bridge.devices.length}}) </h2>
@@ -52,6 +39,7 @@
 				<td>{{device.deviceType}}</td>
 				<td>{{device.targetDevice}}</td>
 				<td>
+					<p>
 					<button class="btn btn-info" type="submit"
 						ng-click="testUrl(device, 'on')">Test ON</button>
 					<button class="btn btn-info" type="submit"
@@ -60,86 +48,11 @@
 						ng-click="editDevice(device)">Edit/Copy</button>
 					<button class="btn btn-danger" type="submit"
 						ng-click="deleteDevice(device)">Delete</button>
+					</p>
 				</td>
 			</tr>
 		</table>
 	</div>
-
-	<div class="panel panel-default bridgeServer">
-		<div class="panel-heading">
-			<h1 class="panel-title">Bridge Settings <a ng-click="toggle()"><span class={{imgUrl}} aria-hidden="true"></a></h1>
-		</div>
-		<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-2 control-label" for="bridge-base">Bridge
-						server</label>
-
-					<div class="col-xs-8 col-sm-7">
-						<input id="bridge-base" class="form-control" type="text"
-							ng-model="bridge.base" placeholder="URL to bridge">
-					</div>
-					<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="goBridgeUrl(bridge.base)">Go</button>
-				</div>
-			</form>
-			<table class="table table-bordered table-striped table-hover">
-				<thead>
-					<tr>
-						<th>Setting</th>
-						<th>Value</th>
-					</tr>
-				</thead>
-				<tr>
-					<td>upnp.config.address</td>
-					<td>{{bridge.settings.upnpconfigaddress}}</td>
-				</tr>
-				<tr>
-					<td>server.port</td>
-					<td>{{bridge.settings.serverport}}</td>
-				</tr>
-				<tr>
-					<td>upnp.devices.db</td>
-					<td>{{bridge.settings.upnpdevicedb}}</td>
-				</tr>
-				<tr>
-					<td>upnp.response.port</td>
-					<td>{{bridge.settings.upnpresponseport}}</td>
-				</tr>
-				<tr>
-					<td>vera.address</td>
-					<td>{{bridge.settings.veraaddress}}</td>
-				</tr>
-				<tr>
-					<td>harmony.address</td>
-					<td>{{bridge.settings.harmonyaddress}}</td>
-				</tr>
-				<tr>
-					<td>upnp.strict</td>
-					<td>{{bridge.settings.upnpstrict}}</td>
-				</tr>
-				<tr>
-					<td>trace.upnp</td>
-					<td>{{bridge.settings.traceupnp}}</td>
-				</tr>
-				<tr>
-					<td>dev.mode</td>
-					<td>{{bridge.settings.devmode}}</td>
-				</tr>
-				<tr>
-					<td>nest.configured</td>
-					<td>{{bridge.settings.nestconfigured}}</td>
-				</tr>
-				<tr>
-					<td>button.sleep</td>
-					<td>{{bridge.settings.buttonsleep}} ms</td>
-				</tr>
-			</table>
-		</div>
-	</div>
 	<div class="panel panel-default backup">
 		<div class="panel-heading">
 			<h1 class="panel-title">Bridge Device DB Backup <a ng-click="toggleBk()"><span class={{imgBkUrl}} aria-hidden="true"></a></h1>
@@ -176,4 +89,20 @@
 			</table>
 		</div>
 	</div>
+	
+	<script type="text/ng-template" id="valueDialog">
+		<div class="ngdialog-message">
+			<h2>Select value</h2>
+				<p>
+					    <input type="radio" ng-model="valueType" value="percentage" ng-change="changeScale()"> Percentage
+					    <input type="radio" ng-model="valueType" value="raw" ng-change="changeScale()"> Raw
+				</p>
+				<p>
+					<rzslider rz-slider-model="slider.value" rz-slider-options="slider.options"></rzslider>
+				</p>
+		</div>
+		<div class="ngdialog-buttons mt">
+			<button type="button" class="ngdialog-button ngdialog-button-primary" ng-click="setValue()">Set</button>
+		</div>
+	</script>
 	

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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 role="presentation" class="active"><a href="#/harmonyactivities">Harmony Activities</a></li>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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 role="presentation"><a href="#/harmonyactivities">Harmony Activities</a></li>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</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>

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

@@ -0,0 +1,210 @@
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation" class="active"><a href="#/system">Bridge Control</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 ng-if="bridge.showNest" role="presentation"><a href="#/nest">Nest</a></li>
+        <li role="presentation"><a href="#/editor">Manual Add</a></li>
+      </ul>
+
+	<div class="panel panel-default bridgeServer">
+		<div class="panel-heading">
+			<h1 class="panel-title">Bridge Settings</h1>
+		</div>
+		<div class="panel-body">
+
+			<form class="form-horizontal">
+				<div class="form-group">
+					<label class="col-xs-12 col-sm-2 control-label" for="bridge-base">Bridge
+						server</label>
+
+					<div class="col-xs-8 col-sm-7">
+						<input id="bridge-base" class="form-control" type="text"
+							ng-model="bridge.base" placeholder="URL to bridge">
+					</div>
+					<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="goBridgeUrl(bridge.base)">Go</button>
+				</div>
+			</form>
+			<form name="form">
+			<p>
+				<button ng-disabled="form.$pristine || bridge.isInControl" class="btn btn-success" type="submit"
+					ng-click="saveSettings()">Save</button>
+				<button ng-disabled="bridge.isInControl" class="btn btn-warning" type="submit"
+					ng-click="bridgeReinit()">Bridge Reinitialize</button>
+				<button ng-disabled="bridge.isInControl" class="btn btn-danger" type="submit"
+					ng-click="bridgeStop()">Bridge Stop</button>
+				<button class="btn btn-primary" type="submit"
+					onclick="myRefresh()">Refresh</button>
+				<script>
+				function myRefresh() {
+				    location.reload();
+				}
+				</script>
+			</p>
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>Setting</th>
+						<th>Value</th>
+					</tr>
+				</thead>
+				<tr>
+					<td>Configuration Path and File</td>
+					<td><input id="bridge-settings-configfile" class="form-control" type="text"
+							ng-model="bridge.settings.configfile" placeholder="data/ha-bridge.config"></td>
+				</tr>
+				<tr>
+					<td>Device DB Path and File</td>
+					<td><input id="bridge-settings-upnpdevicedb" class="form-control" type="text"
+							ng-model="bridge.settings.upnpdevicedb" placeholder="data/device.db"></td>
+				</tr>
+				<tr>
+					<td>UPNP IP Address</td>
+					<td><input id="bridge-settings-upnpconfigaddress" class="form-control" type="text"
+							ng-model="bridge.settings.upnpconfigaddress" placeholder="192.168.1.1"></td>
+				</tr>
+				<tr>
+					<td>Web Server Port</td>
+					<td><input id="bridge-settings-serverport" class="form-control" type="number"
+							ng-model="bridge.settings.serverport"  min="1" max="65535"></td>
+				</tr>
+				<tr>
+					<td>UPNP Response Port</td>
+					<td><input id="bridge-settings-upnpresponseport" class="form-control" type="number"
+							ng-model="bridge.settings.upnpresponseport"  min="1" max="65535"></td>
+				</tr>
+				<tr>
+					<td>Vera Names and IP Addresses</td>
+						<td><table class="table table-bordered table-striped table-hover">
+							<thead>
+								<tr>
+									<th>Name</th>
+									<th>IP</th>
+									<th>Manage</th>
+								</tr>
+							</thead>
+							<tr ng-repeat="vera in bridge.settings.veraaddress.devices">
+								<td>{{vera.name}}</td>
+								<td>{{vera.ip}}</td>
+								<td><button class="btn btn-danger" type="submit"
+										ng-click="removeVeratoSettings(vera.name, vera.ip)">Del</button></td>
+							</tr>
+							<tr>
+								<td><input id="bridge-settings-next-vera-name" class="form-control" type="text"
+									ng-model="newveraname" placeholder="A Vera"></td>
+								<td><input id="bridge-settings-next-vera-ip" class="form-control" type="text"
+									ng-model="newveraip" placeholder="192.168.1.2"></td>
+									<td><button class="btn btn-success" type="submit"
+										ng-click="addVeratoSettings(newveraname, newveraip)">Add</button></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td>Harmony Names and IP Addresses</td>
+					<td><table class="table table-bordered table-striped table-hover">
+							<thead>
+								<tr>
+									<th>Name</th>
+									<th>IP</th>
+									<th>Manage</th>
+								</tr>
+							</thead>
+							<tr ng-repeat="harmony in bridge.settings.harmonyaddress.devices">
+								<td>{{harmony.name}}</td>
+								<td>{{harmony.ip}}</td>
+								<td><button class="btn btn-danger" type="submit"
+										ng-click="removeHarmonytoSettings(harmony.name, harmony.ip)">Del</button></td>
+							</tr>
+							<tr>
+								<td><input id="bridge-settings-next-harmony-name" class="form-control" type="text"
+									ng-model="newharmonyname" placeholder="A Harmony"></td>
+								<td><input id="bridge-settings-next-harmony-ip" class="form-control" type="text"
+									ng-model="newharmonyip" placeholder="192.168.1.3"></td>
+									<td><button class="btn btn-success" type="submit"
+										ng-click="addHarmonytoSettings(newharmonyname, newharmonyip)">Add</button></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td>Harmony Username</td>
+					<td><input id="bridge-settings-harmonyuser" class="form-control" type="text"
+							ng-model="bridge.settings.harmonyuser" placeholder="someone@gmail.com"></td>
+				</tr>
+				<tr>
+					<td>Harmony Password</td>
+					<td><input id="bridge-settings-harmonypwd" class="form-control" type="password"
+							ng-model="bridge.settings.harmonypwd" placeholder="thepassword"></td>
+				</tr>
+				<tr>
+					<td>Button Press Sleep Interval (ms)</td>
+					<td><input id="bridge-settings-buttonsleep" class="form-control" type="number" name="input"
+							ng-model="bridge.settings.buttonsleep" min="100" max="9999"></td>
+				</tr>
+				<tr>
+					<td>Nest Username</td>
+					<td><input id="bridge-settings-nestuser" class="form-control" type="text"
+							ng-model="bridge.settings.nestuser" placeholder="someone@gmail.com"></td>
+				</tr>
+				<tr>
+					<td>Nest Password</td>
+					<td><input id="bridge-settings-nestpwd" class="form-control" type="password"
+							ng-model="bridge.settings.nestpwd" placeholder="thepassword"></td>
+				</tr>
+				<tr>
+					<td>UPNP Strict Handling</td>
+					<td><input type="checkbox" ng-model="bridge.settings.upnpstrict"
+           				ng-true-value=true ng-false-value=false>  {{bridge.settings.upnpstrict}}</td>
+				</tr>
+				<tr>
+					<td>Trace UPNP Calls</td>
+					<td><input type="checkbox" ng-model="bridge.settings.traceupnp"
+           				ng-true-value=true ng-false-value=false>  {{bridge.settings.traceupnp}}</td>
+				</tr>
+			</table>
+			</form>
+		</div>
+	</div>
+	<div class="panel panel-default backup">
+		<div class="panel-heading">
+			<h1 class="panel-title">Bridge Settings Backup <a ng-click="toggleBk()"><span class={{imgBkUrl}} aria-hidden="true"></a></h1>
+		</div>
+		<div ng-if="visibleBk" class="animate-if" class="panel-body">
+			<form class="form-horizontal">
+				<div class="form-group">
+					<label class="col-xs-12 col-sm-2 control-label" for="backup-name">Backup Settings File Name</label>
+
+					<div class="col-xs-8 col-sm-7">
+						<input id="backup-name" class="form-control" type="text"
+							ng-model="optionalbackupname" placeholder="Optional">
+					</div>
+					<button type="submit" class="btn btn-primary"
+						ng-click="backupSettings(optionalbackupname)">Backup Settings</button>
+				</div>
+			</form>
+			<table class="table table-bordered table-striped table-hover">
+				<thead>
+					<tr>
+						<th>Filename</th>
+						<th>Actions</th>
+					</tr>
+				</thead>
+				<tr ng-repeat="backup in bridge.configs">
+					<td>{{backup}}</td>
+					<td>
+						<button class="btn btn-danger" type="submit"
+							ng-click="restoreSettings(backup)">Restore</button>
+						<button class="btn btn-warning" type="submit"
+							ng-click="deleteSettingsBackup(backup)">Delete</button>
+					</td>
+				</tr>
+			</table>
+		</div>
+	</div>
+	

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</a></li>
         <li role="presentation" class="active"><a href="#/veradevices">Vera Devices</a></li>
         <li role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
         <li ng-if="bridge.showHarmony" role="presentation"><a href="#/harmonyactivities">Harmony Activities</a></li>

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

@@ -1,5 +1,6 @@
       <ul class="nav nav-pills" role="tablist">
-        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#">Bridge Devices</a></li>
+        <li role="presentation"><a href="#/system">Bridge Control</a></li>
         <li role="presentation"><a href="#/veradevices">Vera Devices</a></li>
         <li role="presentation" class="active"><a href="#/verascenes">Vera Scenes</a></li>
         <li ng-if="bridge.showHarmony" role="presentation"><a href="#/harmonyactivities">Harmony Activities</a></li>