git://source.jalview.org
/
jabaws.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Google Analytics statistics is added
[jabaws.git]
/
engine
/
compbio
/
engine
/
conf
/
PropertyHelperManager.java
diff --git
a/engine/compbio/engine/conf/PropertyHelperManager.java
b/engine/compbio/engine/conf/PropertyHelperManager.java
index
939e5fe
..
b3d2b66
100644
(file)
--- 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;
\r
import java.net.URL;
\r
\r
import java.net.URISyntaxException;
\r
import java.net.URL;
\r
\r
-import javax.naming.ConfigurationException;
\r
-
\r
import org.apache.log4j.Logger;
\r
\r
import compbio.util.PropertyHelper;
\r
import org.apache.log4j.Logger;
\r
\r
import compbio.util.PropertyHelper;
\r
@@
-52,7
+50,7
@@
public final class PropertyHelperManager {
*
\r
* Try 1 - succeed.
\r
*
\r
*
\r
* Try 1 - succeed.
\r
*
\r
- * @return
\r
+ * @return an instance
\r
*/
\r
public static PropertyHelper getPropertyHelper() {
\r
if (ph == null) {
\r
*/
\r
public static PropertyHelper getPropertyHelper() {
\r
if (ph == null) {
\r
@@
-63,8
+61,10
@@
public final class PropertyHelperManager {
+ "Engine.cluster.properties");
\r
File execProp = getResourceFromClasspath(confDir
\r
+ "Executable.properties");
\r
+ "Engine.cluster.properties");
\r
File execProp = getResourceFromClasspath(confDir
\r
+ "Executable.properties");
\r
+ File gaProp = getResourceFromClasspath(confDir
\r
+ + "GA.properties");
\r
ph = new PropertyHelper(locEngineProp, clustEngineProp,
\r
ph = new PropertyHelper(locEngineProp, clustEngineProp,
\r
- execProp);
\r
+ execProp, gaProp);
\r
} catch (IOException e) {
\r
log.warn(
\r
"Cannot read property files! Reason: "
\r
} catch (IOException e) {
\r
log.warn(
\r
"Cannot read property files! Reason: "
\r
@@
-91,8
+91,9
@@
public final class PropertyHelperManager {
* binaries WEB-INF classes compbio engine conf If the structure changes it
\r
* must be reflected in this method
\r
*
\r
* binaries WEB-INF classes compbio engine conf If the structure changes it
\r
* must be reflected in this method
\r
*
\r
- * @return
\r
- * @throws ConfigurationException
\r
+ * @return the local path
\r
+ * @throws RuntimeException
\r
+ * if cannot determine the local path
\r
*/
\r
public static String getLocalPath() {
\r
String clname = PropertyHelperManager.class.getSimpleName();
\r
*/
\r
public static String getLocalPath() {
\r
String clname = PropertyHelperManager.class.getSimpleName();
\r