* ConsoleRunner:

- Fix webapps file path
    * SusiDNS:
      - Fix addressbook file path
    * Systray:
      - Fix NPE if no config file
      - Fix config file path
    * WorkingDir:
      - Modify clients.config so jetty can find the jetty.xml file
      - Rip out all the existing-installation migration code
      - Rip out migration code now done by izpack parsable
      - Fix copy of empty directories

apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java

@@ -24,6 +24,7 @@
 
 package i2p.susi.dns;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -110,9 +111,12 @@ public class AddressbookBean
 	{
 		loadConfig();
 		String filename = properties.getProperty( getBook() + "_addressbook" );
-		if (filename.startsWith("../"))
-			return filename.substring(3);
-		return ConfigBean.addressbookPrefix + filename;
+		// clean up the ../ with getCanonicalPath()
+		File path = new File(ConfigBean.addressbookPrefix, filename);
+		try {
+			return path.getCanonicalPath();
+		} catch (IOException ioe) {}
+		return filename;
 	}
 	private Object[] entries;
 	public Object[] getEntries()