[jboss-svn-commits] JBL Code SVN: r30604 - in labs/jbossrules/trunk/drools-planner/drools-planner-core/src: main/java/org/drools/planner/benchmark and 42 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2009-12-11 10:01:34 -0500 (Fri, 11 Dec 2009)
New Revision: 30604

Added:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/resources/org/drools/planner/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/resources/org/drools/planner/
Removed:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/resources/org/drools/solver/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/resources/org/drools/solver/
Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticListener.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticPoint.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/SolverStatistic.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/XmlSolverConfigurer.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/LocalSearchSolverConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/accepter/AccepterConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/selector/SelectorConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/termination/TerminationConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/ScoreConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/definition/ScoreDefinitionConfig.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/AbstractSolver.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/Solver.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/SolverAware.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/BestSolutionChangedEvent.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventListener.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventSupport.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/DefaultLocalSearchSolver.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolver.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverAware.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverLifecycleListener.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/StepScope.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/bestsolution/BestSolutionRecaller.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/Decider.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DeciderAware.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/MoveScope.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/AbstractAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/Accepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/CompositeAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/MoveTabuAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/PropertyTabuAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/SolutionTabuAccepter.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/TabuPropertyEnabled.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/AbstractDeciderScoreComparatorFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/HardPenaltyDeciderScoreComparator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AbstractForager.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedMoveScopeComparator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/Forager.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/AbstractSelector.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/CompositeSelector.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/MoveFactorySelector.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/Selector.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/TopListSelector.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/stepstatistic/StepStatistic.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractCompositeTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AndCompositeTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/OrCompositeTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/ScoreAttainedTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/StepCountTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/Termination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/TimeMillisSpendTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/UnimprovedStepCountTermination.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/CompositeMove.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/Move.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/AbstractMoveFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/CachedMoveFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/MoveFactory.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/AbstractScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/HardAndSoftScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/SimpleScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/AbstractScoreCalculator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/DefaultHardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/HardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/ScoreCalculator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/SimpleScoreCalculator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/FlatteningHardAndSoftScoreComparator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/NaturalScoreComparator.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintOccurrence.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintType.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/DoubleConstraintOccurrence.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/IntConstraintOccurrence.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/UnweightedConstraintOccurrence.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/AbstractScoreDefinition.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinition.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/ScoreDefinition.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/SimpleScoreDefinition.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/AbstractStartingSolutionInitializer.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/StartingSolutionInitializer.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactoryTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/move/DummyMove.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/DefaultHardAndSoftScoreTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java
Log:
drools-solver renamed to drools-planner: rename package org.drools.solver to org.drools.planner

Copied: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner (from rev 30602, labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver)

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/MaxScoreSolverBenchmarkComparator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.benchmark;
+package org.drools.planner.benchmark;
 
 import java.util.Comparator;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/SolverBenchmark.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.benchmark;
+package org.drools.planner.benchmark;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -6,7 +6,7 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import org.drools.solver.config.localsearch.LocalSearchSolverConfig;
+import org.drools.planner.config.localsearch.LocalSearchSolverConfig;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/SolverBenchmarkResult.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.benchmark;
+package org.drools.planner.benchmark;
 
 import java.io.File;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/SolverBenchmarkSuite.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.benchmark;
+package org.drools.planner.benchmark;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,11 +24,11 @@
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.drools.solver.config.localsearch.LocalSearchSolverConfig;
-import org.drools.solver.core.Solver;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.benchmark.statistic.BestScoreStatistic;
-import org.drools.solver.benchmark.statistic.SolverStatistic;
+import org.drools.planner.config.localsearch.LocalSearchSolverConfig;
+import org.drools.planner.core.Solver;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.benchmark.statistic.BestScoreStatistic;
+import org.drools.planner.benchmark.statistic.SolverStatistic;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/XmlSolverBenchmarker.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.benchmark;
+package org.drools.planner.benchmark;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -10,7 +10,6 @@
 import java.io.UnsupportedEncodingException;
 
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.annotations.Annotations;
 import com.thoughtworks.xstream.converters.reflection.FieldDictionary;
 import com.thoughtworks.xstream.converters.reflection.NativeFieldKeySorter;
 import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/statistic/BestScoreStatistic.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.benchmark.statistic;
+package org.drools.planner.benchmark.statistic;
 
 import java.util.List;
 import java.util.Map;
@@ -13,10 +13,10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.drools.solver.core.Solver;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.SimpleScore;
-import org.drools.solver.core.score.HardAndSoftScore;
+import org.drools.planner.core.Solver;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.SimpleScore;
+import org.drools.planner.core.score.HardAndSoftScore;
 import org.apache.commons.io.IOUtils;
 
 /**

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticListener.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/statistic/BestScoreStatisticListener.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticListener.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.benchmark.statistic;
+package org.drools.planner.benchmark.statistic;
 
 import java.util.List;
 import java.util.ArrayList;
 
-import org.drools.solver.core.event.BestSolutionChangedEvent;
-import org.drools.solver.core.event.SolverEventListener;
+import org.drools.planner.core.event.BestSolutionChangedEvent;
+import org.drools.planner.core.event.SolverEventListener;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/statistic/BestScoreStatisticPoint.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatisticPoint.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,7 @@
-package org.drools.solver.benchmark.statistic;
+package org.drools.planner.benchmark.statistic;
 
-import org.drools.solver.core.event.BestSolutionChangedEvent;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.event.BestSolutionChangedEvent;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/SolverStatistic.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/benchmark/statistic/SolverStatistic.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/SolverStatistic.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.benchmark.statistic;
+package org.drools.planner.benchmark.statistic;
 
 import java.io.File;
 
-import org.drools.solver.core.Solver;
+import org.drools.planner.core.Solver;
 
 /**
  * TODO is this the correct package? Statistics can maybe be used outside the benchmarker

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/XmlSolverConfigurer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/XmlSolverConfigurer.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/XmlSolverConfigurer.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.config;
+package org.drools.planner.config;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -11,8 +11,8 @@
 import com.thoughtworks.xstream.converters.reflection.NativeFieldKeySorter;
 import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
 import org.apache.commons.io.IOUtils;
-import org.drools.solver.config.localsearch.LocalSearchSolverConfig;
-import org.drools.solver.core.localsearch.LocalSearchSolver;
+import org.drools.planner.config.localsearch.LocalSearchSolverConfig;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
 
 /**
  * XML based configuration that builds a Solver.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/LocalSearchSolverConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/LocalSearchSolverConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/LocalSearchSolverConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.config.localsearch;
+package org.drools.planner.config.localsearch;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,19 +13,19 @@
 import org.drools.RuleBaseFactory;
 import org.drools.compiler.DroolsParserException;
 import org.drools.compiler.PackageBuilder;
-import org.drools.solver.config.localsearch.decider.accepter.AccepterConfig;
-import org.drools.solver.config.localsearch.decider.forager.ForagerConfig;
-import org.drools.solver.config.localsearch.decider.selector.SelectorConfig;
-import org.drools.solver.config.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactoryConfig;
-import org.drools.solver.config.localsearch.termination.TerminationConfig;
-import org.drools.solver.config.score.definition.ScoreDefinitionConfig;
-import org.drools.solver.core.localsearch.DefaultLocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.bestsolution.BestSolutionRecaller;
-import org.drools.solver.core.localsearch.decider.Decider;
-import org.drools.solver.core.localsearch.decider.DefaultDecider;
-import org.drools.solver.core.solution.initializer.StartingSolutionInitializer;
-import org.drools.solver.core.score.definition.ScoreDefinition;
+import org.drools.planner.config.localsearch.decider.accepter.AccepterConfig;
+import org.drools.planner.config.localsearch.decider.forager.ForagerConfig;
+import org.drools.planner.config.localsearch.decider.selector.SelectorConfig;
+import org.drools.planner.config.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactoryConfig;
+import org.drools.planner.config.localsearch.termination.TerminationConfig;
+import org.drools.planner.config.score.definition.ScoreDefinitionConfig;
+import org.drools.planner.core.localsearch.DefaultLocalSearchSolver;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
+import org.drools.planner.core.localsearch.bestsolution.BestSolutionRecaller;
+import org.drools.planner.core.localsearch.decider.Decider;
+import org.drools.planner.core.localsearch.decider.DefaultDecider;
+import org.drools.planner.core.solution.initializer.StartingSolutionInitializer;
+import org.drools.planner.core.score.definition.ScoreDefinition;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/accepter/AccepterConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/decider/accepter/AccepterConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/accepter/AccepterConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.config.localsearch.decider.accepter;
+package org.drools.planner.config.localsearch.decider.accepter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,13 +6,13 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import org.apache.commons.lang.ObjectUtils;
-import org.drools.solver.core.localsearch.decider.accepter.Accepter;
-import org.drools.solver.core.localsearch.decider.accepter.CompositeAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.greatdeluge.GreatDelugeAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.simulatedannealing.SimulatedAnnealingAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.tabu.MoveTabuAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.tabu.PropertyTabuAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.tabu.SolutionTabuAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.Accepter;
+import org.drools.planner.core.localsearch.decider.accepter.CompositeAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.greatdeluge.GreatDelugeAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.simulatedannealing.SimulatedAnnealingAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.tabu.MoveTabuAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.tabu.PropertyTabuAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.tabu.SolutionTabuAccepter;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.config.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.config.localsearch.decider.deciderscorecomparator;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.NaturalDeciderScoreComparatorFactory;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.ShiftingHardPenaltyDeciderScoreComparatorFactory;
+import org.drools.planner.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
+import org.drools.planner.core.localsearch.decider.deciderscorecomparator.NaturalDeciderScoreComparatorFactory;
+import org.drools.planner.core.localsearch.decider.deciderscorecomparator.ShiftingHardPenaltyDeciderScoreComparatorFactory;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/decider/forager/ForagerConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.config.localsearch.decider.forager;
+package org.drools.planner.config.localsearch.decider.forager;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.localsearch.decider.forager.AcceptedForager;
-import org.drools.solver.core.localsearch.decider.forager.Forager;
-import org.drools.solver.core.localsearch.decider.forager.PickEarlyByScore;
+import org.drools.planner.core.localsearch.decider.forager.AcceptedForager;
+import org.drools.planner.core.localsearch.decider.forager.Forager;
+import org.drools.planner.core.localsearch.decider.forager.PickEarlyByScore;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/selector/SelectorConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/decider/selector/SelectorConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/selector/SelectorConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,15 +1,15 @@
-package org.drools.solver.config.localsearch.decider.selector;
+package org.drools.planner.config.localsearch.decider.selector;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
-import org.drools.solver.core.localsearch.decider.selector.CompositeSelector;
-import org.drools.solver.core.localsearch.decider.selector.MoveFactorySelector;
-import org.drools.solver.core.localsearch.decider.selector.Selector;
-import org.drools.solver.core.localsearch.decider.selector.TopListSelector;
-import org.drools.solver.core.move.factory.MoveFactory;
+import org.drools.planner.core.localsearch.decider.selector.CompositeSelector;
+import org.drools.planner.core.localsearch.decider.selector.MoveFactorySelector;
+import org.drools.planner.core.localsearch.decider.selector.Selector;
+import org.drools.planner.core.localsearch.decider.selector.TopListSelector;
+import org.drools.planner.core.move.factory.MoveFactory;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/termination/TerminationConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/termination/TerminationConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,18 +1,18 @@
-package org.drools.solver.config.localsearch.termination;
+package org.drools.planner.config.localsearch.termination;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.localsearch.termination.AbstractCompositeTermination;
-import org.drools.solver.core.localsearch.termination.AndCompositeTermination;
-import org.drools.solver.core.localsearch.termination.ScoreAttainedTermination;
-import org.drools.solver.core.localsearch.termination.Termination;
-import org.drools.solver.core.localsearch.termination.OrCompositeTermination;
-import org.drools.solver.core.localsearch.termination.StepCountTermination;
-import org.drools.solver.core.localsearch.termination.TimeMillisSpendTermination;
-import org.drools.solver.core.localsearch.termination.UnimprovedStepCountTermination;
-import org.drools.solver.core.score.definition.ScoreDefinition;
+import org.drools.planner.core.localsearch.termination.AbstractCompositeTermination;
+import org.drools.planner.core.localsearch.termination.AndCompositeTermination;
+import org.drools.planner.core.localsearch.termination.ScoreAttainedTermination;
+import org.drools.planner.core.localsearch.termination.Termination;
+import org.drools.planner.core.localsearch.termination.OrCompositeTermination;
+import org.drools.planner.core.localsearch.termination.StepCountTermination;
+import org.drools.planner.core.localsearch.termination.TimeMillisSpendTermination;
+import org.drools.planner.core.localsearch.termination.UnimprovedStepCountTermination;
+import org.drools.planner.core.score.definition.ScoreDefinition;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/ScoreConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/score/ScoreConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/ScoreConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.config.score;
+package org.drools.planner.config.score;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.score.DefaultSimpleScore;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.score.DefaultSimpleScore;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/definition/ScoreDefinitionConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/config/score/definition/ScoreDefinitionConfig.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/score/definition/ScoreDefinitionConfig.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,11 +1,11 @@
-package org.drools.solver.config.score.definition;
+package org.drools.planner.config.score.definition;
 
-import org.drools.solver.core.score.definition.ScoreDefinition;
-import org.drools.solver.core.score.definition.SimpleScoreDefinition;
-import org.drools.solver.core.score.definition.HardAndSoftScoreDefinition;
-import org.drools.solver.core.score.calculator.ScoreCalculator;
-import org.drools.solver.core.score.calculator.SimpleScoreCalculator;
-import org.drools.solver.core.score.calculator.DefaultHardAndSoftConstraintScoreCalculator;
+import org.drools.planner.core.score.definition.ScoreDefinition;
+import org.drools.planner.core.score.definition.SimpleScoreDefinition;
+import org.drools.planner.core.score.definition.HardAndSoftScoreDefinition;
+import org.drools.planner.core.score.calculator.ScoreCalculator;
+import org.drools.planner.core.score.calculator.SimpleScoreCalculator;
+import org.drools.planner.core.score.calculator.DefaultHardAndSoftConstraintScoreCalculator;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 /**

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/AbstractSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/AbstractSolver.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/AbstractSolver.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core;
+package org.drools.planner.core;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.drools.solver.core.localsearch.DefaultLocalSearchSolver;
-import org.drools.solver.core.event.SolverEventSupport;
-import org.drools.solver.core.event.SolverEventListener;
+import org.drools.planner.core.localsearch.DefaultLocalSearchSolver;
+import org.drools.planner.core.event.SolverEventSupport;
+import org.drools.planner.core.event.SolverEventListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/Solver.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/Solver.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/Solver.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,9 @@
-package org.drools.solver.core;
+package org.drools.planner.core;
 
 import java.util.concurrent.Future;
 
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.event.SolverEventListener;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.event.SolverEventListener;
 
 /**
  * A Solver solves planning problems.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/SolverAware.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/SolverAware.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/SolverAware.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core;
+package org.drools.planner.core;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/BestSolutionChangedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/event/BestSolutionChangedEvent.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/BestSolutionChangedEvent.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.event;
+package org.drools.planner.core.event;
 
 import java.util.EventObject;
 
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.Solver;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.Solver;
 
 /**
  * Delivered when the best solution changes during solving.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/event/SolverEventListener.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventListener.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.event;
+package org.drools.planner.core.event;
 
 import java.util.EventListener;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/event/SolverEventSupport.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/event/SolverEventSupport.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,10 @@
-package org.drools.solver.core.event;
+package org.drools.planner.core.event;
 
 import java.util.Iterator;
 
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.Solver;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.Solver;
 import org.drools.event.AbstractEventSupport;
-import org.drools.event.RuleBaseEventListener;
-import org.drools.event.BeforePackageAddedEvent;
 
 /**
  * Internal API.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/DefaultLocalSearchSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/DefaultLocalSearchSolver.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,18 +1,17 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
 import java.util.Random;
 
 import org.drools.RuleBase;
-import org.drools.solver.core.localsearch.bestsolution.BestSolutionRecaller;
-import org.drools.solver.core.localsearch.decider.Decider;
-import org.drools.solver.core.localsearch.termination.Termination;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.score.calculator.ScoreCalculator;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.definition.ScoreDefinition;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.solution.initializer.StartingSolutionInitializer;
-import org.drools.solver.core.AbstractSolver;
+import org.drools.planner.core.localsearch.bestsolution.BestSolutionRecaller;
+import org.drools.planner.core.localsearch.decider.Decider;
+import org.drools.planner.core.localsearch.termination.Termination;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.score.calculator.ScoreCalculator;
+import org.drools.planner.core.score.definition.ScoreDefinition;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.solution.initializer.StartingSolutionInitializer;
+import org.drools.planner.core.AbstractSolver;
 
 /**
  * Default implementation of {@link LocalSearchSolver}.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/LocalSearchSolver.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolver.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
-import org.drools.solver.core.Solver;
+import org.drools.planner.core.Solver;
 
 /**
  * A LocalSearchSolver is a Solver which uses a local search algorithm,

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverAware.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/LocalSearchSolverAware.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverAware.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverLifecycleListener.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/LocalSearchSolverLifecycleListener.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverLifecycleListener.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/LocalSearchSolverScope.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,14 +1,14 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
 import java.util.Random;
 
 import org.drools.RuleBase;
 import org.drools.StatefulSession;
 import org.drools.WorkingMemory;
-import org.drools.solver.core.score.calculator.ScoreCalculator;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.definition.ScoreDefinition;
-import org.drools.solver.core.solution.Solution;
+import org.drools.planner.core.score.calculator.ScoreCalculator;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.definition.ScoreDefinition;
+import org.drools.planner.core.solution.Solution;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/StepScope.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/StepScope.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/StepScope.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,12 @@
-package org.drools.solver.core.localsearch;
+package org.drools.planner.core.localsearch;
 
 import java.util.Random;
 import java.util.Comparator;
 
 import org.drools.WorkingMemory;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/bestsolution/BestSolutionRecaller.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/bestsolution/BestSolutionRecaller.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,13 +1,13 @@
-package org.drools.solver.core.localsearch.bestsolution;
+package org.drools.planner.core.localsearch.bestsolution;
 
-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.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.event.SolverEventSupport;
-import org.drools.solver.core.solution.Solution;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
+import org.drools.planner.core.localsearch.LocalSearchSolverAware;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.event.SolverEventSupport;
+import org.drools.planner.core.solution.Solution;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/Decider.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/Decider.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/Decider.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.localsearch.decider;
+package org.drools.planner.core.localsearch.decider;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.forager.Forager;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
+import org.drools.planner.core.localsearch.LocalSearchSolverAware;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.forager.Forager;
+import org.drools.planner.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
 
 /**
  * A decider decides the next step.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DeciderAware.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/DeciderAware.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DeciderAware.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,7 +1,5 @@
-package org.drools.solver.core.localsearch.decider;
+package org.drools.planner.core.localsearch.decider;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-
 /**
  * @author Geoffrey De Smet
  */

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,17 +1,17 @@
-package org.drools.solver.core.localsearch.decider;
+package org.drools.planner.core.localsearch.decider;
 
 import java.util.List;
 
 import org.drools.WorkingMemory;
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.accepter.Accepter;
-import org.drools.solver.core.localsearch.decider.forager.Forager;
-import org.drools.solver.core.localsearch.decider.selector.Selector;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.accepter.Accepter;
+import org.drools.planner.core.localsearch.decider.forager.Forager;
+import org.drools.planner.core.localsearch.decider.selector.Selector;
+import org.drools.planner.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.score.Score;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/MoveScope.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/MoveScope.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/MoveScope.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,13 +1,13 @@
-package org.drools.solver.core.localsearch.decider;
+package org.drools.planner.core.localsearch.decider;
 
 import java.util.Random;
 
 import org.drools.WorkingMemory;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.solution.Solution;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.solution.Solution;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/AbstractAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/AbstractAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,7 @@
-package org.drools.solver.core.localsearch.decider.accepter;
+package org.drools.planner.core.localsearch.decider.accepter;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.Decider;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/Accepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/Accepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/Accepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,7 @@
-package org.drools.solver.core.localsearch.decider.accepter;
+package org.drools.planner.core.localsearch.decider.accepter;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.DeciderAware;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.decider.MoveScope;
 
 /**
  * An Accepter accepts or rejects a selected move for the Decider.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/CompositeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/CompositeAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.localsearch.decider.accepter;
+package org.drools.planner.core.localsearch.decider.accepter;
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
 
 /**
  * Combines several accepters into one.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.localsearch.decider.accepter.greatdeluge;
+package org.drools.planner.core.localsearch.decider.accepter.greatdeluge;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.accepter.AbstractAccepter;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.decider.accepter.AbstractAccepter;
+import org.drools.planner.core.score.Score;
 
 /**
  * TODO Under construction. Feel free to create a patch to improve this accepter!

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.localsearch.decider.accepter.simulatedannealing;
+package org.drools.planner.core.localsearch.decider.accepter.simulatedannealing;
 
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.accepter.AbstractAccepter;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.decider.accepter.AbstractAccepter;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.score.Score;
 
 /**
  * TODO Under construction. Feel free to create a patch to improve this accepter!

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch.decider.accepter.tabu;
+package org.drools.planner.core.localsearch.decider.accepter.tabu;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -7,11 +7,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.accepter.AbstractAccepter;
-import org.drools.solver.core.localsearch.decider.accepter.Accepter;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.decider.accepter.AbstractAccepter;
+import org.drools.planner.core.localsearch.decider.accepter.Accepter;
 
 /**
  * Abstract superclass for all TabuAccepters.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/MoveTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/MoveTabuAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/MoveTabuAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,11 +1,11 @@
-package org.drools.solver.core.localsearch.decider.accepter.tabu;
+package org.drools.planner.core.localsearch.decider.accepter.tabu;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.move.Move;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.move.Move;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/PropertyTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/PropertyTabuAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/PropertyTabuAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.localsearch.decider.accepter.tabu;
+package org.drools.planner.core.localsearch.decider.accepter.tabu;
 
 import java.util.Collection;
 
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/SolutionTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/SolutionTabuAccepter.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/SolutionTabuAccepter.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.localsearch.decider.accepter.tabu;
+package org.drools.planner.core.localsearch.decider.accepter.tabu;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/TabuPropertyEnabled.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/TabuPropertyEnabled.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/accepter/tabu/TabuPropertyEnabled.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch.decider.accepter.tabu;
+package org.drools.planner.core.localsearch.decider.accepter.tabu;
 
 import java.util.Collection;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/AbstractDeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/AbstractDeciderScoreComparatorFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/AbstractDeciderScoreComparatorFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,7 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
 
 /**
  * A DeciderScoreComparatorFactory creates a new DeciderScoreComparator each step,

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/HardPenaltyDeciderScoreComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/HardPenaltyDeciderScoreComparator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/HardPenaltyDeciderScoreComparator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.HardAndSoftScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.HardAndSoftScore;
 
 /**
  * Compares 2 HardAndSoftScore based on the calculation the hard multiplied by a weight to the soft.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.comparator.NaturalScoreComparator;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.comparator.NaturalScoreComparator;
 
 /**
  * Implementation of {@link DeciderScoreComparatorFactory}.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,12 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.score.HardAndSoftScore;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.comparator.NaturalScoreComparator;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.score.HardAndSoftScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.comparator.NaturalScoreComparator;
 
 /**
  * Implementation of {@link HardAndSoftScore}.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AbstractForager.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AbstractForager.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,7 +1,7 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForager.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,14 +1,14 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.score.Score;
 
 /**
  * An AcceptedForager is a Forager which forages accepted moves and ignores unaccepted moves.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedMoveScopeComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedMoveScopeComparator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedMoveScopeComparator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,11 +1,10 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
 import java.util.Comparator;
 
 import org.apache.commons.lang.builder.CompareToBuilder;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.deciderscorecomparator.DeciderScoreComparatorFactory;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/Forager.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/Forager.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/Forager.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,11 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.DeciderAware;
-import org.drools.solver.core.move.Move;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.move.Move;
 
 /**
  * A Forager collects the accepted moves and picks the next step from those for the Decider.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/PickEarlyByScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/AbstractSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractSelector.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/AbstractSelector.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,8 @@
-package org.drools.solver.core.localsearch.decider.selector;
+package org.drools.planner.core.localsearch.decider.selector;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.Decider;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.Decider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/CompositeSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/CompositeSelector.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/CompositeSelector.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,13 +1,12 @@
-package org.drools.solver.core.localsearch.decider.selector;
+package org.drools.planner.core.localsearch.decider.selector;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.Decider;
-import org.drools.solver.core.move.Move;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.Decider;
+import org.drools.planner.core.move.Move;
 
 /**
  * A CompositeSelector unions multiple Selectors.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/MoveFactorySelector.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/MoveFactorySelector.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/MoveFactorySelector.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,14 +1,13 @@
-package org.drools.solver.core.localsearch.decider.selector;
+package org.drools.planner.core.localsearch.decider.selector;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.Decider;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.move.factory.MoveFactory;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.Decider;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.move.factory.MoveFactory;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/Selector.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/Selector.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/Selector.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,11 @@
-package org.drools.solver.core.localsearch.decider.selector;
+package org.drools.planner.core.localsearch.decider.selector;
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.DeciderAware;
-import org.drools.solver.core.move.Move;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.DeciderAware;
+import org.drools.planner.core.move.Move;
 
 /**
  * A Selector selects or generates moves for the Decider.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/TopListSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/TopListSelector.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/selector/TopListSelector.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,11 @@
-package org.drools.solver.core.localsearch.decider.selector;
+package org.drools.planner.core.localsearch.decider.selector;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.drools.solver.core.localsearch.DefaultLocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.move.Move;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.move.Move;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/stepstatistic/StepStatistic.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/stepstatistic/StepStatistic.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/stepstatistic/StepStatistic.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.localsearch.stepstatistic;
+package org.drools.planner.core.localsearch.stepstatistic;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractCompositeTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/AbstractCompositeTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractCompositeTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * Abstract superclass for CompositeTermination classes that combine multiple Terminations.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/AbstractTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AbstractTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.LocalSearchSolver;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AndCompositeTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/AndCompositeTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/AndCompositeTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/OrCompositeTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/OrCompositeTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/OrCompositeTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/ScoreAttainedTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/ScoreAttainedTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/ScoreAttainedTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/StepCountTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/StepCountTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/StepCountTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/Termination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/Termination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/Termination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverAware;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * A Termination determines when the LocalSearchSolver should stop.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/TimeMillisSpendTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/TimeMillisSpendTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/TimeMillisSpendTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/UnimprovedStepCountTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/localsearch/termination/UnimprovedStepCountTermination.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/termination/UnimprovedStepCountTermination.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.localsearch.termination;
+package org.drools.planner.core.localsearch.termination;
 
-import org.drools.solver.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.StepScope;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/CompositeMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/move/CompositeMove.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/CompositeMove.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,14 +1,10 @@
-package org.drools.solver.core.move;
+package org.drools.planner.core.move;
 
 import java.util.List;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.ArrayList;
 
 import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * A CompositeMove is composided out of multiple other moves.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/Move.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/move/Move.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/Move.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,10 +1,10 @@
-package org.drools.solver.core.move;
+package org.drools.planner.core.move;
 
 import org.drools.FactHandle;
 import org.drools.WorkingMemory;
-import org.drools.solver.core.Solver;
-import org.drools.solver.core.move.factory.MoveFactory;
-import org.drools.solver.core.solution.Solution;
+import org.drools.planner.core.Solver;
+import org.drools.planner.core.move.factory.MoveFactory;
+import org.drools.planner.core.solution.Solution;
 
 /**
  * A Move represents a change in the solution.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/AbstractMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/move/factory/AbstractMoveFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/AbstractMoveFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,8 @@
-package org.drools.solver.core.move.factory;
+package org.drools.planner.core.move.factory;
 
-import org.drools.solver.core.localsearch.LocalSearchSolver;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.Decider;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.Decider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/CachedMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/move/factory/CachedMoveFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/CachedMoveFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,11 +1,11 @@
-package org.drools.solver.core.move.factory;
+package org.drools.planner.core.move.factory;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.solution.Solution;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.solution.Solution;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/MoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/move/factory/MoveFactory.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/move/factory/MoveFactory.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,12 +1,11 @@
-package org.drools.solver.core.move.factory;
+package org.drools.planner.core.move.factory;
 
 import java.util.List;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverAware;
-import org.drools.solver.core.localsearch.LocalSearchSolverLifecycleListener;
-import org.drools.solver.core.localsearch.decider.DeciderAware;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.solution.Solution;
+import org.drools.planner.core.localsearch.LocalSearchSolverLifecycleListener;
+import org.drools.planner.core.localsearch.decider.DeciderAware;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.solution.Solution;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/AbstractScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/AbstractScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/AbstractScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 import java.io.Serializable;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/DefaultHardAndSoftScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 /**
  * Default implementation of {@link HardAndSoftScore}.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/DefaultSimpleScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,5 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 /**
  * Default implementation of {@link SimpleScore}.
  * <p/>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/HardAndSoftScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/HardAndSoftScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/HardAndSoftScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 /**
  * A HardAndSoftScore is a Score based on hard constraints and soft constraints.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/Score.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 /**
  * A Score is result of the score function (AKA fitness function) on a single possible solution.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/SimpleScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/SimpleScore.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/SimpleScore.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 /**
  * A SimpleScore is a Score based on constraints.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/AbstractScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/calculator/AbstractScoreCalculator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/AbstractScoreCalculator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.calculator;
+package org.drools.planner.core.score.calculator;
 
 import java.io.Serializable;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/DefaultHardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/calculator/DefaultHardAndSoftConstraintScoreCalculator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/DefaultHardAndSoftConstraintScoreCalculator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,7 +1,7 @@
-package org.drools.solver.core.score.calculator;
+package org.drools.planner.core.score.calculator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/HardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/calculator/HardAndSoftConstraintScoreCalculator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/HardAndSoftConstraintScoreCalculator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.calculator;
+package org.drools.planner.core.score.calculator;
 
 /**
  * @TODO rename to HardAndSoftScoreCalculator if it survives the score-in-solution refactor

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/ScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/calculator/ScoreCalculator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/ScoreCalculator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.score.calculator;
+package org.drools.planner.core.score.calculator;
 
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.Score;
 
 /**
  * Evaluates a solution based on its WorkingMemory (which is part of the rule production system).

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/SimpleScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/calculator/SimpleScoreCalculator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/calculator/SimpleScoreCalculator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,7 +1,7 @@
-package org.drools.solver.core.score.calculator;
+package org.drools.planner.core.score.calculator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.DefaultSimpleScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.DefaultSimpleScore;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/FlatteningHardAndSoftScoreComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/comparator/FlatteningHardAndSoftScoreComparator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/FlatteningHardAndSoftScoreComparator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.score.comparator;
+package org.drools.planner.core.score.comparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.HardAndSoftScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.HardAndSoftScore;
 
 /**
  * Compares 2 HardAndSoftScore after flattening: the hard multiplied by a hardWeight gets added to the soft.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/NaturalScoreComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/comparator/NaturalScoreComparator.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/comparator/NaturalScoreComparator.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.score.comparator;
+package org.drools.planner.core.score.comparator;
 
 import java.util.Comparator;
 
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.Score;
 
 /**
  * Compares by the natural order of scores.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintOccurrence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/constraint/ConstraintOccurrence.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintOccurrence.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.constraint;
+package org.drools.planner.core.score.constraint;
 
 import java.util.Arrays;
 import java.io.Serializable;

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintType.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/constraint/ConstraintType.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/ConstraintType.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.constraint;
+package org.drools.planner.core.score.constraint;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/DoubleConstraintOccurrence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/constraint/DoubleConstraintOccurrence.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/DoubleConstraintOccurrence.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.constraint;
+package org.drools.planner.core.score.constraint;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/IntConstraintOccurrence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/constraint/IntConstraintOccurrence.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/IntConstraintOccurrence.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.constraint;
+package org.drools.planner.core.score.constraint;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/UnweightedConstraintOccurrence.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/constraint/UnweightedConstraintOccurrence.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/constraint/UnweightedConstraintOccurrence.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score.constraint;
+package org.drools.planner.core.score.constraint;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/AbstractScoreDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/definition/AbstractScoreDefinition.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/AbstractScoreDefinition.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.score.definition;
+package org.drools.planner.core.score.definition;
 
 import java.io.Serializable;
 
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.Score;
 
 /**
  * Abstract superclass for {@link ScoreDefinition}.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/definition/HardAndSoftScoreDefinition.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinition.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.score.definition;
+package org.drools.planner.core.score.definition;
 
-import org.drools.solver.core.score.HardAndSoftScore;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.HardAndSoftScore;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/ScoreDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/definition/ScoreDefinition.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/ScoreDefinition.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.score.definition;
+package org.drools.planner.core.score.definition;
 
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.Score;
 
 /**
  * A ScoreDefinition knows how to compare scores and what the perfect maximum/minimum Score is.
@@ -39,7 +39,7 @@
 
     /**
      * @TODO rename because
-     *       org.drools.solver.core.localsearch.decider.accepter.simulatedannealing.SimulatedAnnealingAccepter
+     *       org.drools.planner.core.localsearch.decider.accepter.simulatedannealing.SimulatedAnnealingAccepter
      *       also uses it
      * @param startScore never null
      * @param endScore never null

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/SimpleScoreDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/score/definition/SimpleScoreDefinition.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/definition/SimpleScoreDefinition.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,8 @@
-package org.drools.solver.core.score.definition;
+package org.drools.planner.core.score.definition;
 
-import org.drools.solver.core.score.SimpleScore;
-import org.drools.solver.core.score.DefaultSimpleScore;
-import org.drools.solver.core.score.Score;
+import org.drools.planner.core.score.SimpleScore;
+import org.drools.planner.core.score.DefaultSimpleScore;
+import org.drools.planner.core.score.Score;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/solution/Solution.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/Solution.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,9 +1,9 @@
-package org.drools.solver.core.solution;
+package org.drools.planner.core.solution;
 
 import java.util.Collection;
 
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.Solver;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.Solver;
 
 /**
  * A Solution represents a problem and a possible solution of that problem.

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/AbstractStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/solution/initializer/AbstractStartingSolutionInitializer.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/AbstractStartingSolutionInitializer.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.solution.initializer;
+package org.drools.planner.core.solution.initializer;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/StartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/solver/core/solution/initializer/StartingSolutionInitializer.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/solution/initializer/StartingSolutionInitializer.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,6 +1,6 @@
-package org.drools.solver.core.solution.initializer;
+package org.drools.planner.core.solution.initializer;
 
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
 
 /**
  * @author Geoffrey De Smet

Copied: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/resources/org/drools/planner (from rev 30602, labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/resources/org/drools/solver)

Copied: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner (from rev 30602, labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver)

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,16 +1,16 @@
-package org.drools.solver.core.localsearch.decider.accepter.greatdeluge;
+package org.drools.planner.core.localsearch.decider.accepter.greatdeluge;
 
 import java.util.Random;
 
 import junit.framework.TestCase;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.localsearch.decider.accepter.Accepter;
-import org.drools.solver.core.move.DummyMove;
-import org.drools.solver.core.score.DefaultSimpleScore;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.definition.SimpleScoreDefinition;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.localsearch.decider.accepter.Accepter;
+import org.drools.planner.core.move.DummyMove;
+import org.drools.planner.core.score.DefaultSimpleScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.definition.SimpleScoreDefinition;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactoryTest.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactoryTest.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,11 +1,11 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
+package org.drools.planner.core.localsearch.decider.deciderscorecomparator;
 
 import junit.framework.TestCase;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
-import org.drools.solver.core.score.comparator.NaturalScoreComparator;
-import org.drools.solver.core.score.definition.HardAndSoftScoreDefinition;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.score.comparator.NaturalScoreComparator;
+import org.drools.planner.core.score.definition.HardAndSoftScoreDefinition;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForagerTest.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,18 +1,18 @@
-package org.drools.solver.core.localsearch.decider.forager;
+package org.drools.planner.core.localsearch.decider.forager;
 
 import java.util.List;
 import java.util.Random;
 
 import junit.framework.TestCase;
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.localsearch.decider.MoveScope;
-import org.drools.solver.core.move.DummyMove;
-import org.drools.solver.core.move.Move;
-import org.drools.solver.core.score.DefaultSimpleScore;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.comparator.NaturalScoreComparator;
-import org.drools.solver.core.score.definition.SimpleScoreDefinition;
+import org.drools.planner.core.localsearch.LocalSearchSolverScope;
+import org.drools.planner.core.localsearch.StepScope;
+import org.drools.planner.core.localsearch.decider.MoveScope;
+import org.drools.planner.core.move.DummyMove;
+import org.drools.planner.core.move.Move;
+import org.drools.planner.core.score.DefaultSimpleScore;
+import org.drools.planner.core.score.Score;
+import org.drools.planner.core.score.comparator.NaturalScoreComparator;
+import org.drools.planner.core.score.definition.SimpleScoreDefinition;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/move/DummyMove.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/move/DummyMove.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/move/DummyMove.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.move;
+package org.drools.planner.core.move;
 
 import org.drools.WorkingMemory;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/DefaultHardAndSoftScoreTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/score/DefaultHardAndSoftScoreTest.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/DefaultHardAndSoftScoreTest.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.score;
+package org.drools.planner.core.score;
 
 import junit.framework.TestCase;
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/solver/core/score/definition/HardAndSoftScoreDefinitionTest.java	2009-12-11 11:26:31 UTC (rev 30602)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java	2009-12-11 15:01:34 UTC (rev 30604)
@@ -1,8 +1,7 @@
-package org.drools.solver.core.score.definition;
+package org.drools.planner.core.score.definition;
 
 import junit.framework.TestCase;
-import org.drools.solver.core.score.Score;
-import org.drools.solver.core.score.DefaultHardAndSoftScore;
+import org.drools.planner.core.score.DefaultHardAndSoftScore;
 
 /**
  * @author Geoffrey De Smet

Copied: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/resources/org/drools/planner (from rev 30602, labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/resources/org/drools/solver)