From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 23 Jun 2011 14:15:51 +0000 (+0000)
Subject: update to compbio.utils and a few small changes
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd78b5c873320ed46a8f4139d9d98cc4c7987b08;p=jabaws.git

update to compbio.utils and a few small changes

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4327 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/.classpath b/.classpath
index b83e40e..c9e34d0 100644
--- a/.classpath
+++ b/.classpath
@@ -9,9 +9,9 @@
 	<classpathentry kind="lib" path="testsrc/lib/testng-5.10-jdk15.jar"/>
 	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/drmaa.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/compbio-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/derby.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/compbio-util-1.4.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/compbio-util-1.4.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/compbio-annotations-1.0.jar"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>
diff --git a/WEB-INF/lib/compbio-util-1.4.jar b/WEB-INF/lib/compbio-util-1.4.jar
index 7abd95e..a7d9249 100644
Binary files a/WEB-INF/lib/compbio-util-1.4.jar and b/WEB-INF/lib/compbio-util-1.4.jar differ
diff --git a/conf/log4j.properties b/conf/log4j.properties
index 2ce2bf5..94dd72d 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -17,10 +17,10 @@ log4j.rootLogger=ERROR, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%m%n
+log4j.appender.stdout.layout.ConversionPattern=%t %d %m%n
 
 ## Uncomment to enable JWS2 activity logging to the file
-log4j.logger.compbio=TRACE, ACTIVITY
+log4j.logger.compbio=INFO, ACTIVITY
 log4j.appender.ACTIVITY=org.apache.log4j.RollingFileAppender
 log4j.appender.ACTIVITY.File=${logDir}/activity.log
 log4j.appender.ACTIVITY.MaxFileSize=10MB
diff --git a/engine/compbio/engine/conf/PropertyHelperManager.java b/engine/compbio/engine/conf/PropertyHelperManager.java
index e8aa9a7..939e5fe 100644
--- a/engine/compbio/engine/conf/PropertyHelperManager.java
+++ b/engine/compbio/engine/conf/PropertyHelperManager.java
@@ -66,8 +66,9 @@ public final class PropertyHelperManager {
 				ph = new PropertyHelper(locEngineProp, clustEngineProp,
 						execProp);
 			} catch (IOException e) {
-				log.warn("Cannot read property files! Reason: "
-						+ e.getLocalizedMessage(), e.getCause());
+				log.warn(
+						"Cannot read property files! Reason: "
+								+ e.getLocalizedMessage(), e.getCause());
 			}
 		}
 		return ph;
@@ -111,11 +112,10 @@ public final class PropertyHelperManager {
 		} catch (IllegalArgumentException e) {
 			// Classes are in the jar file, using different method to determine
 			// the path new File(INCORRECT URL) throws it
-			log
-					.warn(
-							"It looks like classes are in the jar file. "
-									+ "Attempting a different method to determinine the path to the resources "
-									+ e.getLocalizedMessage(), e.getCause());
+			log.debug(
+					"It looks like classes are in the jar file. "
+							+ "Attempting a different method to determinine the path to the resources "
+							+ e.getLocalizedMessage(), e.getCause());
 			try {
 				f = new File(PropertyHelperManager.class.getProtectionDomain()
 						.getCodeSource().getLocation().toURI().getPath());
@@ -128,8 +128,9 @@ public final class PropertyHelperManager {
 					f = f.getParentFile();
 				}
 			} catch (URISyntaxException e1) {
-				log.error("Could not find resources path! "
-						+ e1.getLocalizedMessage(), e1.getCause());
+				log.error(
+						"Could not find resources path! "
+								+ e1.getLocalizedMessage(), e1.getCause());
 				throw new RuntimeException("Could not find resources path! ",
 						e1.getCause());
 			}