X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=engine%2Fcompbio%2Fengine%2Fconf%2FPropertyHelperManager.java;h=b3d2b66328ee601d3cec95cd174d15d9faf82865;hb=23fb18b3f14a1b396f0c61f2ea4559fec758cb1d;hp=939e5fe100bbc0c0dee481c4d6cd02346cddab48;hpb=fd78b5c873320ed46a8f4139d9d98cc4c7987b08;p=jabaws.git diff --git a/engine/compbio/engine/conf/PropertyHelperManager.java b/engine/compbio/engine/conf/PropertyHelperManager.java index 939e5fe..b3d2b66 100644 --- a/engine/compbio/engine/conf/PropertyHelperManager.java +++ b/engine/compbio/engine/conf/PropertyHelperManager.java @@ -23,8 +23,6 @@ import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; -import javax.naming.ConfigurationException; - import org.apache.log4j.Logger; import compbio.util.PropertyHelper; @@ -52,7 +50,7 @@ public final class PropertyHelperManager { * * Try 1 - succeed. * - * @return + * @return an instance */ public static PropertyHelper getPropertyHelper() { if (ph == null) { @@ -63,8 +61,10 @@ public final class PropertyHelperManager { + "Engine.cluster.properties"); File execProp = getResourceFromClasspath(confDir + "Executable.properties"); + File gaProp = getResourceFromClasspath(confDir + + "GA.properties"); ph = new PropertyHelper(locEngineProp, clustEngineProp, - execProp); + execProp, gaProp); } catch (IOException e) { log.warn( "Cannot read property files! Reason: " @@ -91,8 +91,9 @@ public final class PropertyHelperManager { * binaries WEB-INF classes compbio engine conf If the structure changes it * must be reflected in this method * - * @return - * @throws ConfigurationException + * @return the local path + * @throws RuntimeException + * if cannot determine the local path */ public static String getLocalPath() { String clname = PropertyHelperManager.class.getSimpleName();