[DL-Learner SVN] SF.net SVN: dl-learner:[3880] trunk/interfaces

[<lor...@us...>]

Revision: 3880
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3880&view=rev
Author:   lorenz_b
Date:     2012-12-11 19:34:37 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Set default log level to INFO in log4j.properties file. Added config option logLevel(String value) for cli to set the log level via config file.

Modified Paths:
--------------
    trunk/interfaces/pom.xml
    trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
    trunk/interfaces/src/main/java/org/dllearner/cli/GlobalEnrichment.java
    trunk/interfaces/src/main/resources/log4j.properties

Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml	2012-11-29 15:21:42 UTC (rev 3879)
+++ trunk/interfaces/pom.xml	2012-12-11 19:34:37 UTC (rev 3880)
@@ -383,6 +383,12 @@
 		<dependency>
 			<groupId>org.dllearner</groupId>
 			<artifactId>components-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>jena</artifactId>
+					<groupId>com.hp.hpl.jena</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!--dependency> <groupId>org.dllearner</groupId> <artifactId>components-ext</artifactId> 
 			</dependency -->

Modified: trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java	2012-11-29 15:21:42 UTC (rev 3879)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java	2012-12-11 19:34:37 UTC (rev 3880)
@@ -29,6 +29,7 @@
 
 
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.log4j.Level;
 import org.apache.xmlbeans.XmlObject;
 import org.dllearner.algorithms.ParCEL.ParCELPosNegLP;
 import org.dllearner.configuration.IConfiguration;
@@ -70,6 +71,8 @@
 	private boolean performCrossValidation = false;
 	private int nrOfFolds = 10;
 	private int noOfRuns = 1;
+	
+	private String logLevel = "INFO";
 
 
 	public CLI() {
@@ -97,6 +100,11 @@
 	}
 	
     public void run() throws IOException {
+    	try {
+			org.apache.log4j.Logger.getLogger("org.dllearner").setLevel(Level.toLevel(logLevel.toUpperCase()));
+		} catch (Exception e) {
+			logger.warn("Error setting log level to " + logLevel);
+		}
     	
 		if (writeSpringConfiguration) {
         	SpringConfigurationXMLBeanConverter converter = new SpringConfigurationXMLBeanConverter();
@@ -272,6 +280,14 @@
 		this.nrOfFolds = nrOfFolds;
 	}
 	
+	public void setLogLevel(String logLevel) {
+		this.logLevel = logLevel;
+	}
+	
+	public String getLogLevel() {
+		return logLevel;
+	}
+	
 	public LearningAlgorithm getLearningAlgorithm() {
 		return algorithm;
 	}

Modified: trunk/interfaces/src/main/java/org/dllearner/cli/GlobalEnrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/GlobalEnrichment.java	2012-11-29 15:21:42 UTC (rev 3879)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/GlobalEnrichment.java	2012-12-11 19:34:37 UTC (rev 3880)
@@ -111,6 +111,8 @@
 	public static void main(String[] args) throws MalformedURLException, IllegalArgumentException, SecurityException, ComponentInitException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, LearningProblemUnsupportedException, FileNotFoundException {
 		new File(baseDir).mkdirs();
 		
+		new File(baseDir).mkdirs();
+		
 		SimpleLayout layout = new SimpleLayout();
 		ConsoleAppender consoleAppender = new ConsoleAppender(layout);
 		Logger.getRootLogger().setLevel(Level.WARN);

Modified: trunk/interfaces/src/main/resources/log4j.properties
===================================================================
--- trunk/interfaces/src/main/resources/log4j.properties	2012-11-29 15:21:42 UTC (rev 3879)
+++ trunk/interfaces/src/main/resources/log4j.properties	2012-12-11 19:34:37 UTC (rev 3880)
@@ -13,9 +13,9 @@
 log4j.appender.file.Threshold=DEBUG
 
 # DL-Learner Logs
-log4j.logger.org.dllearner=DEBUG
+log4j.logger.org.dllearner=INFO
 # Turn this to Debug if you wish to dump stack traces to the appenders (console, file)
-log4j.logger.org.dllearner.cli=DEBUG
+log4j.logger.org.dllearner.cli=INFO
 log4j.logger.org.dllearner.server.nke.LogicalRelationStrategy=DEBUG
 log4j.category.org.dllearner.kb.simple=DEBUG
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.