bdi4jade

diff --git a/bdi-jade/src/bdi4jade/core/Capability.java b/bdi-jade/src/bdi4jade/core/Capability.java
index ea31bfe..8489460 100644
--- a/bdi-jade/src/bdi4jade/core/Capability.java
+++ b/bdi-jade/src/bdi4jade/core/Capability.java
@@ -65,6 +65,7 @@ import bdi4jade.util.ReflectionUtils;
 public class Capability implements Serializable {
 
 	private static final long serialVersionUID = -4922359927943108421L;
+	private static final Log log = LogFactory.getLog(Capability.class);
 
 	private final Set<Capability> associationSources;
 	private final Set<Capability> associationTargets;
@@ -74,7 +75,6 @@ public class Capability implements Serializable {
 	private Map<Class<? extends Capability>, Set<Capability>> fullAccessOwnersMap;
 	protected final String id;
 	private final Collection<Intention> intentions;
-	protected final Log log;
 	private BDIAgent myAgent;
 	private OptionGenerationFunction optionGenerationFunction;
 	private final List<Class<? extends Capability>> parentCapabilities;
@@ -143,7 +143,6 @@ public class Capability implements Serializable {
 	protected Capability(String id, BeliefBase beliefBase,
 			Set<Belief<?, ?>> initialBeliefs, PlanLibrary planLibrary,
 			Set<Plan> initialPlans) {
-		this.log = LogFactory.getLog(getClass());
 		this.intentions = new LinkedList<>();
 		this.parentCapabilities = generateParentCapabilities();
 		log.debug("Parent capabilities: " + parentCapabilities);

diff --git a/bdi-jade/src/bdi4jade/core/Intention.java b/bdi-jade/src/bdi4jade/core/Intention.java
index 62d727b..c2287cd 100644
--- a/bdi-jade/src/bdi4jade/core/Intention.java
+++ b/bdi-jade/src/bdi4jade/core/Intention.java
@@ -57,12 +57,13 @@ import bdi4jade.plan.planbody.PlanBody;
  */
 public class Intention {
 
+	private static final Log log = LogFactory.getLog(Intention.class);
+
 	private PlanBody currentPlan;
 	private final Capability dispatcher;
 	private final Set<Plan> executedPlans;
 	private final Goal goal;
 	private final List<GoalListener> goalListeners;
-	private final Log log;
 	private final AbstractBDIAgent myAgent;
 	private boolean noLongerDesired;
 	private final Set<Capability> owners;
@@ -97,7 +98,6 @@ public class Intention {
 	 */
 	public Intention(Goal goal, AbstractBDIAgent bdiAgent, Capability dispatcher)
 			throws IllegalAccessException {
-		this.log = LogFactory.getLog(this.getClass());
 		this.goal = goal;
 		this.myAgent = bdiAgent;
 		this.unachievable = false;

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
index bb75e91..76e7d88 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
@@ -45,10 +45,11 @@ import bdi4jade.reasoning.PlanSelectionStrategy;
 public class UtilityBasedPlanSelectionStrategy extends
 		AbstractReasoningStrategy implements PlanSelectionStrategy {
 
-	private final Log log;
+	private static final Log log = LogFactory
+			.getLog(UtilityBasedPlanSelectionStrategy.class);
 
 	public UtilityBasedPlanSelectionStrategy() {
-		this.log = LogFactory.getLog(getClass());
+
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/bdi-jade/src/bdi4jade/message/BDIAgentMsgReceiver.java b/bdi-jade/src/bdi4jade/message/BDIAgentMsgReceiver.java
index fe5e5d1..59919e2 100644
--- a/bdi-jade/src/bdi4jade/message/BDIAgentMsgReceiver.java
+++ b/bdi-jade/src/bdi4jade/message/BDIAgentMsgReceiver.java
@@ -74,11 +74,10 @@ public class BDIAgentMsgReceiver extends MsgReceiver {
 
 	}
 
+	private static final Log log = LogFactory.getLog(BDIAgentMsgReceiver.class);
 	public static final Object MSG_KEY = "msgs";
 	private static final long serialVersionUID = -4435254708782532901L;
 
-	private final Log log;
-
 	/**
 	 * Initializes this message receiver, which is associated with a BDI agent.
 	 * 
@@ -89,7 +88,6 @@ public class BDIAgentMsgReceiver extends MsgReceiver {
 		super((Agent) agent, MessageTemplate.MatchAll(), INFINITE,
 				new DataStore(), MSG_KEY);
 		this.template = new MessageTemplate(new BDIAgentMatchExpression());
-		this.log = LogFactory.getLog(this.getClass());
 	}
 
 	/**

diff --git a/bdi-jade/src/bdi4jade/plan/planbody/AbstractPlanBody.java b/bdi-jade/src/bdi4jade/plan/planbody/AbstractPlanBody.java
index 02ee1be..1f87c7b 100644
--- a/bdi-jade/src/bdi4jade/plan/planbody/AbstractPlanBody.java
+++ b/bdi-jade/src/bdi4jade/plan/planbody/AbstractPlanBody.java
@@ -53,11 +53,11 @@ import bdi4jade.util.ReflectionUtils;
 public abstract class AbstractPlanBody extends Behaviour implements PlanBody {
 
 	private static final long serialVersionUID = -6488256636028800227L;
+	private static final Log log = LogFactory.getLog(AbstractPlanBody.class);
 
 	private EndState endState;
 	private final List<GoalEvent> goalEventQueue;
 	private Intention intention;
-	protected final Log log;
 	private Plan plan;
 	private final List<Goal> subgoals;
 
@@ -65,7 +65,6 @@ public abstract class AbstractPlanBody extends Behaviour implements PlanBody {
 	 * Creates a new plan body.
 	 */
 	public AbstractPlanBody() {
-		this.log = LogFactory.getLog(getClass());
 		this.plan = null;
 		this.intention = null;
 		this.endState = null;

diff --git a/bdi-jade/src/bdi4jade/plan/planbody/ParallelGoalPlanBody.java b/bdi-jade/src/bdi4jade/plan/planbody/ParallelGoalPlanBody.java
index f474e9c..c081cb1 100644
--- a/bdi-jade/src/bdi4jade/plan/planbody/ParallelGoalPlanBody.java
+++ b/bdi-jade/src/bdi4jade/plan/planbody/ParallelGoalPlanBody.java
@@ -25,6 +25,9 @@ package bdi4jade.plan.planbody;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import bdi4jade.event.GoalEvent;
 import bdi4jade.goal.Goal;
 import bdi4jade.goal.GoalStatus;
@@ -39,6 +42,8 @@ import bdi4jade.plan.Plan.EndState;
 public class ParallelGoalPlanBody extends AbstractPlanBody implements
 		OutputPlanBody {
 
+	private static final Log log = LogFactory
+			.getLog(ParallelGoalPlanBody.class);
 	private static final long serialVersionUID = -5919677537834351951L;
 
 	protected List<Goal> completedGoals;

diff --git a/bdi-jade/src/bdi4jade/plan/planbody/SequentialGoalPlanBody.java b/bdi-jade/src/bdi4jade/plan/planbody/SequentialGoalPlanBody.java
index 74fc80d..d93933b 100644
--- a/bdi-jade/src/bdi4jade/plan/planbody/SequentialGoalPlanBody.java
+++ b/bdi-jade/src/bdi4jade/plan/planbody/SequentialGoalPlanBody.java
@@ -26,6 +26,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import bdi4jade.annotation.Parameter;
 import bdi4jade.event.GoalEvent;
 import bdi4jade.exception.ParameterException;
@@ -44,6 +47,8 @@ import bdi4jade.util.ReflectionUtils;
 public class SequentialGoalPlanBody extends AbstractPlanBody implements
 		OutputPlanBody {
 
+	private static final Log log = LogFactory
+			.getLog(SequentialGoalPlanBody.class);
 	private static final long serialVersionUID = -5919677537834351951L;
 
 	protected List<Goal> completedGoals;