Merge pull request #225 from 'melissalinkert/9308-config-paths'

Note: This closes gh-225 but also includes
melissalinkert/gh-2 which Jean-Marie opened.
I've manually merged them altogether here
since I don't have access to Melissa's repo.

components/insight/SRC/org/openmicroscopy/shoola/env/Container.java

@@ -243,12 +243,14 @@ public String getConfigFileRelative()
 	 */
 	public String getConfigFileRelative(String file)
 	{ 
-        StringBuffer relPath = new StringBuffer(CONFIG_DIR);
-        if (IOUtil.isJavaWebStart() && UIUtilities.isWindowsOS())
-            relPath.append("/");
-        else relPath.append(File.separatorChar);
-        relPath.append(file);
-        return relPath.toString();
+		if (IOUtil.isJavaWebStart()) {
+			StringBuffer relPath = new StringBuffer(CONFIG_DIR);
+	        if (UIUtilities.isWindowsOS()) relPath.append("/");
+	        else relPath.append(File.separatorChar);
+	        relPath.append(file);
+	        return relPath.toString();
+		}
+		return resolveFilePath(file, CONFIG_DIR);
 	}
 
 	/**

components/insight/SRC/org/openmicroscopy/shoola/env/init/AgentsInit.java

@@ -24,6 +24,7 @@
 package org.openmicroscopy.shoola.env.init;
 
 //Java imports
+import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 
@@ -123,8 +124,8 @@ private void createAgent(AgentInfo info, int value)
 	private Registry createAgentRegistry(String configFile)
 		throws Exception
 	{
-		String relPathName = container.getConfigFileRelative(configFile);
-		Registry agentReg = RegistryFactory.makeNew(relPathName),
+		String pathName = container.getConfigFileRelative(configFile);
+		Registry agentReg = RegistryFactory.makeNew(pathName),
 					containerReg = container.getRegistry();
 		RegistryFactory.linkEventBus(containerReg.getEventBus(), agentReg);
 		RegistryFactory.linkLogger(containerReg.getLogger(), agentReg);

components/insight/SRC/org/openmicroscopy/shoola/env/init/ContainerConfigInit.java

@@ -109,4 +109,3 @@ void execute()
 	void rollback() {}
 
 }
-