[jboss-svn-commits] JBL Code SVN: r15602 - in labs/jbossrules/trunk: drools-solver/drools-solver-core and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 5 11:18:52 EDT 2007
Author: ge0ffrey
Date: 2007-10-05 11:18:51 -0400 (Fri, 05 Oct 2007)
New Revision: 15602
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/MaxScoreOfAllForager.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/pom.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/app/CommonBenchmarkApp.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/persistence/XstreamSolutionDaoImpl.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/SolutionPanel.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/WorkflowFrame.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/SmartTravelingTournamentMoveFactory.java
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-1233 Solver should use slf4j, like jbrms + optimize imports
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/pom.xml 2007-10-05 15:18:51 UTC (rev 15602)
@@ -47,9 +47,19 @@
<!-- Logging -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Xstream -->
<dependency>
@@ -58,5 +68,4 @@
</dependency>
</dependencies>
-
</project>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,11 +1,11 @@
package org.drools.solver.core.evaluation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.RuleBase;
import org.drools.StatefulSession;
import org.drools.solver.core.evaluation.scorecalculator.ScoreCalculator;
import org.drools.solver.core.solution.Solution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holds a solution and its WorkingMemory.
@@ -16,7 +16,7 @@
public static final String GLOBAL_SCORE_CALCULATOR_KEY = "scoreCalculator";
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected RuleBase ruleBase;
@@ -63,7 +63,7 @@
}
statefulSession = ruleBase.newStatefulSession();
statefulSession.setGlobal(GLOBAL_SCORE_CALCULATOR_KEY, scoreCalculator);
-// if (log.isTraceEnabled()) {
+// if (logger.isTraceEnabled()) {
// statefulSession.addEventListener(new DebugWorkingMemoryEventListener());
// }
for (Object fact : solution.getFacts()) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -2,21 +2,21 @@
import java.util.Random;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.evaluation.EvaluationHandler;
import org.drools.solver.core.localsearch.bestsolution.BestSolutionRecaller;
import org.drools.solver.core.localsearch.decider.Decider;
import org.drools.solver.core.localsearch.finish.Finish;
import org.drools.solver.core.move.Move;
import org.drools.solver.core.solution.Solution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public class DefaultLocalSearchSolver implements LocalSearchSolver, LocalSearchSolverLifecycleListener {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected long randomSeed; // TODO refactor to AbstractSolver
@@ -109,12 +109,11 @@
beforeDeciding();
Move nextStep = decider.decideNextStep();
if (nextStep == null) {
- log.warn("No move accepted for step (" + getStepIndex() + "). Finishing early.");
+ logger.warn("No move accepted for step ({}). Finishing early.", getStepIndex());
break;
}
- if (log.isInfoEnabled()) {
- log.info("Step (" + getStepIndex() + "), time spend (" + getTimeMillisSpend() + ") doing next step (" + nextStep + ").");
- }
+ logger.info("Step ({}), time spend ({}) doing next step ({}).",
+ new Object[]{getStepIndex(), getTimeMillisSpend(), nextStep});
stepDecided(nextStep);
nextStep.doMove(evaluationHandler.getStatefulSession());
stepScore = evaluationHandler.fireAllRulesAndCalculateStepScore();
@@ -125,7 +124,7 @@
}
public void solvingStarted() {
- log.info("Solving with random seed (" + randomSeed + ").");
+ logger.info("Solving with random seed ({}).", randomSeed);
startingSystemTimeMillis = System.currentTimeMillis();
random = new Random(randomSeed);
stepIndex = 0;
@@ -158,7 +157,7 @@
finish.solvingEnded();
decider.solvingEnded();
evaluationHandler.setSolution(bestSolutionRecaller.getBestSolution());
- log.info("Solved in " + stepIndex + " steps and " + getTimeMillisSpend() + " time millis spend.");
+ logger.info("Solved in {} steps and {} time millis spend.", stepIndex, getTimeMillisSpend());
}
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,19 +1,19 @@
package org.drools.solver.core.localsearch.bestsolution;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.localsearch.LocalSearchSolverAware;
import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
import org.drools.solver.core.move.Move;
import org.drools.solver.core.solution.Solution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public class BestSolutionRecaller implements LocalSearchSolverAware, LocalSearchSolverLifecycleListener {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
@@ -43,10 +43,7 @@
public void solvingStarted() {
double initialScore = localSearchSolver.getStepScore();
- if (log.isInfoEnabled()) {
- log.info("Initial score (" + initialScore + ") is starting best score. "
- + "Updating best solution and best score.");
- }
+ logger.info("Initial score ({}) is starting best score. Updating best solution and best score.", initialScore);
bestSolutionStepIndex = localSearchSolver.getStepIndex();
bestSolution = localSearchSolver.getCurrentSolution().cloneSolution();
bestScore = initialScore;
@@ -61,18 +58,14 @@
public void stepTaken() {
double newScore = localSearchSolver.getStepScore();
if (newScore > bestScore) {
- if (log.isInfoEnabled()) {
- log.info("New score (" + newScore + ") is better then last best score (" + bestScore + "). "
- + "Updating best solution and best score.");
- }
+ logger.info("New score ({}) is better then last best score ({}). Updating best solution and best score.",
+ newScore, bestScore);
bestSolutionStepIndex = localSearchSolver.getStepIndex();
bestSolution = localSearchSolver.getCurrentSolution().cloneSolution();
bestScore = newScore;
// TODO BestSolutionChangedEvent
} else {
- if (log.isInfoEnabled()) {
- log.info("New score (" + newScore + ") is not better then last best score (" + bestScore + ").");
- }
+ logger.info("New score ({}) is not better then last best score ({}).", newScore, bestScore);
}
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,7 +1,5 @@
package org.drools.solver.core.localsearch.decider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.WorkingMemory;
import org.drools.solver.core.evaluation.EvaluationHandler;
import org.drools.solver.core.localsearch.LocalSearchSolver;
@@ -9,13 +7,15 @@
import org.drools.solver.core.localsearch.decider.forager.Forager;
import org.drools.solver.core.localsearch.decider.selector.MoveFactory;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public class DefaultDecider implements Decider {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
@@ -71,9 +71,7 @@
if (move.isMoveDoable(workingMemory)) {
doMove(move);
} else {
- if (log.isDebugEnabled()) {
- log.debug(" Move (" + move + ") ignored because not doable.");
- }
+ logger.debug(" Move ({}) ignored because not doable.", move);
}
if (forager.isQuitEarly()) {
break;
@@ -101,10 +99,8 @@
EvaluationHandler evaluationHandler = localSearchSolver.getEvaluationHandler();
double score = evaluationHandler.fireAllRulesAndCalculateDecisionScore();
double acceptChance = accepter.calculateAcceptChance(move, score);
- if (log.isDebugEnabled()) {
- // TODO the move's toString() is ussually wrong because doMove has already been called
- log.debug(" Move (" + move + ") with score (" + score + ") and acceptChance (" + acceptChance + ").");
- }
+ // TODO the move's toString() is ussually wrong because doMove has already been called
+ logger.debug(" Move ({}) with score ({}) and acceptChance ({}).", new Object[] {move, score, acceptChance});
forager.addMove(move, score, acceptChance);
}
@@ -138,8 +134,8 @@
// private void processMove(Move move, double score) {
// if (decideOnMove(move, score)) {
-// if (log.isDebugEnabled()) {
-// log.debug(" Move (" + move + ") with score (" + score + ") accepted. "
+// if (logger.isDebugEnabled()) {
+// logger.debug(" Move (" + move + ") with score (" + score + ") accepted. "
// + "Updating next move and score.");
// }
// nextMove = move;
@@ -153,8 +149,8 @@
// }
// }
// } else {
-// if (log.isDebugEnabled()) {
-// log.debug(" Move (" + move + ") with score (" + score + ") is not accepted.");
+// if (logger.isDebugEnabled()) {
+// logger.debug(" Move (" + move + ") with score (" + score + ") is not accepted.");
// }
// }
// }
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,16 +1,16 @@
package org.drools.solver.core.localsearch.decider.accepter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public abstract class AbstractAccepter implements Accepter {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -2,17 +2,17 @@
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public class CompositeAccepter extends AbstractAccepter {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected List<Accepter> accepterList;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -67,16 +67,11 @@
}
int tabuStepCount = localSearchSolver.getStepIndex() - maximumTabuStepIndex - 1;
if (tabuStepCount < completeTabuSize) {
- if (log.isDebugEnabled()) {
- log.debug(" Proposed move (" + move + ") is complete tabu.");
- }
+ logger.debug(" Proposed move ({}) is complete tabu.", move);
return 0.0;
}
double acceptChance = calculatePartialTabuAcceptChance(tabuStepCount - completeTabuSize);
- if (log.isDebugEnabled()) {
- log.debug(" Proposed move (" + move + ") is partially tabu with accept chance ("
- + acceptChance + ").");
- }
+ logger.debug(" Proposed move ({}) is partially tabu with accept chance ({}).", move, acceptChance);
return acceptChance;
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,16 +1,16 @@
package org.drools.solver.core.localsearch.decider.forager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public abstract class AbstractForager implements Forager {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/MaxScoreOfAllForager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/MaxScoreOfAllForager.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/MaxScoreOfAllForager.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -70,8 +70,8 @@
}
}
if (pickedMove == null) {
- log.warn("Underflow occured with acceptChanceMaxScoreTotal (" + acceptChanceMaxScoreTotal + ") " +
- "and random (" + random + ").");
+ logger.warn("Underflow occured with acceptChanceMaxScoreTotal ({}) " +
+ "and random ({}).", acceptChanceMaxScoreTotal, random);
// Deal with it anyway (no fail-fast here)
pickedMove = acceptionList.get(acceptionList.size() - 1).getMove();
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractMoveFactory.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractMoveFactory.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,16 +1,16 @@
package org.drools.solver.core.localsearch.decider.selector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public abstract class AbstractMoveFactory implements MoveFactory {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -1,16 +1,16 @@
package org.drools.solver.core.localsearch.finish;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.localsearch.LocalSearchSolver;
import org.drools.solver.core.move.Move;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public abstract class AbstractFinish implements Finish {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected LocalSearchSolver localSearchSolver;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/pom.xml 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/pom.xml 2007-10-05 15:18:51 UTC (rev 15602)
@@ -70,12 +70,18 @@
<!-- Logging -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>compile</scope><!-- Because of direct use for the namespaced logging config -->
</dependency>
<!-- Xstream -->
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/app/CommonBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/app/CommonBenchmarkApp.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/app/CommonBenchmarkApp.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -2,9 +2,9 @@
import java.io.File;
-import org.apache.commons.logging.LogFactory;
import org.apache.log4j.xml.DOMConfigurator;
import org.drools.solver.benchmark.XmlSolverBenchmarker;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
@@ -22,7 +22,7 @@
this.resultFile = resultFile;
DOMConfigurator.configure(getClass().getResource(LOGGING_CONFIG));
// Workaround to make sure logging reports uncaught exceptions
- LogFactory.getLog(getClass()).debug("Logging configured.");
+ LoggerFactory.getLogger(getClass()).debug("Logging configured.");
solverBenchmarker = new XmlSolverBenchmarker().configure(getSolverBenchmarkConfig());
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -5,20 +5,20 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.Solver;
import org.drools.solver.core.evaluation.EvaluationHandler;
import org.drools.solver.core.move.Move;
import org.drools.solver.core.solution.Solution;
import org.drools.solver.examples.common.persistence.SolutionDao;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* @author Geoffrey De Smet
*/
public class SolutionBusiness {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
private SolutionDao solutionDao;
@@ -78,7 +78,7 @@
}
public void doMove(Move move) {
- log.info("Doing user move (" + move + ")");
+ logger.info("Doing user move ({})", move);
move.doMove(evaluationHandler.getStatefulSession());
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/persistence/XstreamSolutionDaoImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/persistence/XstreamSolutionDaoImpl.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/persistence/XstreamSolutionDaoImpl.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -13,16 +13,16 @@
import com.thoughtworks.xstream.converters.reflection.FieldDictionary;
import com.thoughtworks.xstream.converters.reflection.NativeFieldKeySorter;
import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.core.solution.Solution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Geoffrey De Smet
*/
public class XstreamSolutionDaoImpl implements SolutionDao {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
private XStream xStream;
@@ -38,7 +38,7 @@
// xStream.fromXml(InputStream) does not use UTF-8
reader = new InputStreamReader(new FileInputStream(file), "UTF-8");
Solution solution = (Solution) xStream.fromXML(reader);
- log.info("Loaded: " + file);
+ logger.info("Loaded: {}", file);
return solution;
} catch (IOException e) {
throw new IllegalArgumentException("Could not read: " + file, e);
@@ -47,7 +47,7 @@
try {
reader.close();
} catch (IOException e) {
- log.warn("Problem closing file (" + file + ")", e);
+ logger.warn("Problem closing file (" + file + ")", e);
}
}
}
@@ -59,7 +59,7 @@
// xStream.toXml(OutputStream) does not use UTF-8
writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
xStream.toXML(solution, writer);
- log.info("Saved: " + file);
+ logger.info("Saved: {}", file);
} catch (IOException e) {
throw new IllegalArgumentException("Could not write file (" + file + ")", e);
} finally {
@@ -67,7 +67,7 @@
try {
writer.close();
} catch (IOException e) {
- log.warn("Problem closing file (" + file + ")", e);
+ logger.warn("Problem closing file (" + file + ")", e);
}
}
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/SolutionPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/SolutionPanel.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/SolutionPanel.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -2,16 +2,16 @@
import javax.swing.JPanel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.examples.common.business.SolutionBusiness;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* @author Geoffrey De Smet
*/
public abstract class SolutionPanel extends JPanel {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
protected WorkflowFrame workflowFrame;
protected SolutionBusiness solutionBusiness;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/WorkflowFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/WorkflowFrame.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/swingui/WorkflowFrame.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -18,16 +18,16 @@
import javax.swing.JScrollPane;
import javax.swing.filechooser.FileFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.drools.solver.examples.common.business.SolutionBusiness;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
/**
* @author Geoffrey De Smet
*/
public class WorkflowFrame extends JFrame {
- protected final transient Log log = LogFactory.getLog(getClass());
+ protected final transient Logger logger = LoggerFactory.getLogger(getClass());
private SolutionBusiness solutionBusiness;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/SmartTravelingTournamentMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/SmartTravelingTournamentMoveFactory.java 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/SmartTravelingTournamentMoveFactory.java 2007-10-05 15:18:51 UTC (rev 15602)
@@ -50,13 +50,13 @@
TravelingTournament travelingTournament = (TravelingTournament) localSearchSolver.getCurrentSolution();
moveList.addAll(cachedMoveList);
RotationMovesFactory rotationMovesFactory = new RotationMovesFactory(travelingTournament);
- log.debug("Reused " + moveList.size() + " moves for N1 neighborhood.");
+ logger.debug("Reused {} moves for N1 neighborhood.", moveList.size());
int oldSize = moveList.size();
rotationMovesFactory.addDayRotation(moveList);
- log.debug("Created " + (moveList.size() - oldSize) + " moves for N3 U N5 neighborhood.");
+ logger.debug("Created {} moves for N3 U N5 neighborhood.", (moveList.size() - oldSize));
oldSize = moveList.size();
rotationMovesFactory.addTeamRotation(moveList);
- log.debug("Created " + (moveList.size() - oldSize) + " moves for N2 U N4 neighborhood.");
+ logger.debug("Created {} moves for N2 U N4 neighborhood.", (moveList.size() - oldSize));
rotationMovesFactory = null;
return moveList.iterator();
}
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2007-10-05 10:52:12 UTC (rev 15601)
+++ labs/jbossrules/trunk/pom.xml 2007-10-05 15:18:51 UTC (rev 15602)
@@ -793,6 +793,25 @@
<version>1.4.1_final</version>
</dependency>
+ <!-- Logging for drools-repository and drools-solver -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.3.0</version>
+ <!--<scope>runtime</scope> TODO default me on runtime-->
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <!--<scope>runtime</scope> TODO default me on runtime-->
+ </dependency>
+
<!-- drools-repository -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -822,20 +841,7 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.3.0</version>
- </dependency>
-
- <dependency>
<groupId>org.tmatesoft</groupId>
<artifactId>svnkit</artifactId>
<version>1.1.2</version>
@@ -882,11 +888,6 @@
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
<!--
TODO looks like jsr170:jcr:1.0 isn't used any more, remove it from /repository/jsr170/jcr/1.0
More information about the jboss-svn-commits
mailing list