From 7e45a30aeecda20c2e331635f76c4a78173d4156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sat, 5 Jun 2010 17:14:48 +0200
Subject: [PATCH] ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Move
 limiting classes to their own packages from overcrowded packages

---
 .../business/planner/daos/DependencyDAO.java  |  4 ++--
 .../business/planner/entities/Dependency.java |  1 +
 .../planner/entities/ResourceAllocation.java  |  1 +
 .../entities/SpecificResourceAllocation.java  |  1 +
 .../business/planner/entities/Task.java       |  1 +
 .../daos/ILimitingResourceQueueDAO.java       |  2 +-
 .../ILimitingResourceQueueDependencyDAO.java  |  4 ++--
 .../ILimitingResourceQueueElementDAO.java     |  4 ++--
 .../daos/LimitingResourceQueueDAO.java        |  2 +-
 .../LimitingResourceQueueDependencyDAO.java   |  4 ++--
 .../daos/LimitingResourceQueueElementDAO.java |  4 ++--
 .../{ => limiting}/entities/DateAndHour.java  |  2 +-
 .../entities/LimitingResourceAllocator.java   |  9 +++++++-
 .../LimitingResourceQueueDependency.java      |  4 +++-
 .../LimitingResourceQueueElement.java         |  5 ++++-
 .../LimitingResourceQueueElementGap.java      |  2 +-
 .../entities/QueuePosition.java               |  2 +-
 .../entities/LimitingResourceQueue.java       |  2 +-
 ...imitingResourceQueueElementComparator.java |  2 +-
 .../entities/ResourceAllocations.hbm.xml      | 21 ++++++++++---------
 .../business/planner/entities/Tasks.hbm.xml   |  3 ++-
 .../resources/entities/Resources.hbm.xml      |  2 +-
 .../LimitingResourceQueueElementDAOTest.java  |  6 +++---
 .../test/planner/entities/TaskTest.java       |  2 +-
 .../ILimitingResourceQueueModel.java          |  4 ++--
 .../LimitingResourceQueueModel.java           | 16 +++++++-------
 .../LimitingResourcesController.java          |  2 +-
 .../LimitingResourcesPanel.java               |  4 ++--
 .../ManualAllocationController.java           |  8 +++----
 .../web/limitingresources/QueueComponent.java |  4 ++--
 .../limitingresources/QueueListComponent.java |  2 +-
 .../web/limitingresources/QueueTask.java      |  2 +-
 .../ILimitingResourceAllocationModel.java     |  3 ++-
 .../allocation/LimitingAllocationRow.java     |  2 +-
 .../LimitingResourceAllocationController.java |  3 ++-
 .../LimitingResourceAllocationModel.java      |  4 ++--
 .../web/planner/order/SaveCommand.java        |  6 +++---
 .../taskedition/EditTaskController.java       |  2 +-
 38 files changed, 86 insertions(+), 66 deletions(-)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/ILimitingResourceQueueDAO.java (96%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/ILimitingResourceQueueDependencyDAO.java (71%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/ILimitingResourceQueueElementDAO.java (92%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/LimitingResourceQueueDAO.java (97%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/LimitingResourceQueueDependencyDAO.java (81%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/daos/LimitingResourceQueueElementDAO.java (94%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/DateAndHour.java (97%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/LimitingResourceAllocator.java (97%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/LimitingResourceQueueDependency.java (94%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/LimitingResourceQueueElement.java (96%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/LimitingResourceQueueElementGap.java (98%)
 rename navalplanner-business/src/main/java/org/navalplanner/business/planner/{ => limiting}/entities/QueuePosition.java (96%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => limiting}/allocation/ILimitingResourceAllocationModel.java (91%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => limiting}/allocation/LimitingAllocationRow.java (99%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => limiting}/allocation/LimitingResourceAllocationController.java (98%)
 rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => limiting}/allocation/LimitingResourceAllocationModel.java (98%)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DependencyDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DependencyDAO.java
index 6117fe707..caa4f6fb2 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DependencyDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DependencyDAO.java
@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.planner.entities.Dependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Dependency.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Dependency.java
index 9a8c11525..6fed85d01 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Dependency.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Dependency.java
@@ -24,6 +24,7 @@ import java.util.Date;
 
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.common.BaseEntity;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
 
 /**
  * Entity which represents an associated with properties
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index 1a9b46676..41aa67413 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -50,6 +50,7 @@ import org.navalplanner.business.planner.entities.allocationalgorithms.Allocator
 import org.navalplanner.business.planner.entities.allocationalgorithms.AllocatorForTaskDurationAndSpecifiedResourcesPerDay;
 import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification;
 import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Machine;
 import org.navalplanner.business.resources.entities.MachineWorkersConfigurationUnit;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
index 9588a0f42..d1e240032 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
@@ -37,6 +37,7 @@ import org.navalplanner.business.calendars.entities.IWorkHours;
 import org.navalplanner.business.common.ProportionalDistributor;
 import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification;
 import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
index 9be7e29da..5be1ffbd5 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
@@ -45,6 +45,7 @@ import org.navalplanner.business.planner.entities.DerivedAllocationGenerator.IWo
 import org.navalplanner.business.planner.entities.allocationalgorithms.HoursModification;
 import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification;
 import org.navalplanner.business.planner.entities.consolidations.Consolidation;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.Resource;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDAO.java
similarity index 96%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDAO.java
index 47b4cfdea..410619088 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDAO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDependencyDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDependencyDAO.java
similarity index 71%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDependencyDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDependencyDAO.java
index 121d8f528..9317eed93 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueDependencyDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueDependencyDAO.java
@@ -1,9 +1,9 @@
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
 import org.navalplanner.business.common.daos.IGenericDAO;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
 
 /**
  * Interface for repositories to implement queies related to
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueElementDAO.java
similarity index 92%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueElementDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueElementDAO.java
index cd856a097..a7a7d03ce 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ILimitingResourceQueueElementDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/ILimitingResourceQueueElementDAO.java
@@ -18,12 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
 import org.navalplanner.business.common.daos.IGenericDAO;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 
 /**
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDAO.java
similarity index 97%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDAO.java
index ad3a1720e..85ab6aa97 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDAO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDependencyDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDependencyDAO.java
similarity index 81%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDependencyDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDependencyDAO.java
index 226615763..911de92a9 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueDependencyDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueDependencyDAO.java
@@ -1,10 +1,10 @@
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.planner.entities.Dependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueElementDAO.java
similarity index 94%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueElementDAO.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueElementDAO.java
index 1ec0d5d93..fafe0c17c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/LimitingResourceQueueElementDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/daos/LimitingResourceQueueElementDAO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.daos;
+package org.navalplanner.business.planner.limiting.daos;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DateAndHour.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
similarity index 97%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DateAndHour.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
index 2779426b1..663c0ed0f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DateAndHour.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/DateAndHour.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceAllocator.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
similarity index 97%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceAllocator.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
index 90ed6cfbd..e7f5cde3f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceAllocator.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -30,6 +30,13 @@ import java.util.Set;
 
 import org.joda.time.LocalDate;
 import org.navalplanner.business.calendars.entities.ResourceCalendar;
+import org.navalplanner.business.planner.entities.DayAssignment;
+import org.navalplanner.business.planner.entities.GenericDayAssignment;
+import org.navalplanner.business.planner.entities.GenericResourceAllocation;
+import org.navalplanner.business.planner.entities.ResourceAllocation;
+import org.navalplanner.business.planner.entities.ResourcesPerDay;
+import org.navalplanner.business.planner.entities.SpecificDayAssignment;
+import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionCompounder;
 import org.navalplanner.business.resources.entities.ICriterion;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueDependency.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java
similarity index 94%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueDependency.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java
index 6af565b50..e32e2c622 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueDependency.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java
@@ -1,4 +1,4 @@
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import static org.navalplanner.business.i18n.I18nHelper._;
 
@@ -6,6 +6,8 @@ import java.util.EnumMap;
 
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.common.BaseEntity;
+import org.navalplanner.business.planner.entities.Dependency;
+import org.navalplanner.business.planner.entities.Dependency.Type;
 
 
 /**
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
similarity index 96%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElement.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
index 85ad4ff5d..f6c7a1999 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -29,6 +29,9 @@ import java.util.Set;
 import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
 import org.navalplanner.business.common.BaseEntity;
+import org.navalplanner.business.planner.entities.Dependency;
+import org.navalplanner.business.planner.entities.ResourceAllocation;
+import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.navalplanner.business.resources.entities.Resource;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElementGap.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElementGap.java
similarity index 98%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElementGap.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElementGap.java
index eedb77491..1fe701e86 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueElementGap.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElementGap.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import org.joda.time.LocalDate;
 import org.navalplanner.business.calendars.entities.ResourceCalendar;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/QueuePosition.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java
similarity index 96%
rename from navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/QueuePosition.java
rename to navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java
index 1ab54b032..88a82bef6 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/QueuePosition.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.business.planner.entities;
+package org.navalplanner.business.planner.limiting.entities;
 
 import static org.navalplanner.business.i18n.I18nHelper._;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
index 7d8843323..e04a71a51 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java
@@ -25,7 +25,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 import org.navalplanner.business.common.BaseEntity;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 
 /**
  *
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueueElementComparator.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueueElementComparator.java
index 8f25e3989..1b242a9cd 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueueElementComparator.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueueElementComparator.java
@@ -22,7 +22,7 @@ package org.navalplanner.business.resources.entities;
 import java.util.Comparator;
 
 import org.joda.time.LocalDate;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 
 /**
  *
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
index 90cf4a504..c48c32ec2 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
@@ -36,7 +36,7 @@
         <!-- Wrong mapping. A ResourceAllocation only has one limiting resource queue element associated -->
         <set name="limitingResourceQueueElements" cascade="all-delete-orphan" inverse="true">
             <key column="RESOURCE_ALLOCATION_ID" />
-            <one-to-many class="LimitingResourceQueueElement"/>
+            <one-to-many class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement"/>
         </set>
 
         <joined-subclass name="SpecificResourceAllocation" table="specific_resource_allocation">
@@ -70,7 +70,7 @@
     </class>
 
     <!-- LimitingResourceQueueElement -->
-    <class name="LimitingResourceQueueElement" table="limiting_resource_queue_element">
+    <class name="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement" table="limiting_resource_queue_element">
         <id name="id" type="long" access="property">
             <generator class="hilo">
                 <param name="max_lo">100</param>
@@ -89,12 +89,12 @@
 
         <property name="creationTimestamp" column="CREATION_TIMESTAMP" />
 
-        <component name="startQueuePosition" class="org.navalplanner.business.planner.entities.QueuePosition">
+        <component name="startQueuePosition" class="org.navalplanner.business.planner.limiting.entities.QueuePosition">
             <property name="date" column="START_DATE" type="org.joda.time.contrib.hibernate.PersistentLocalDate" />
             <property name="hour" column="START_HOUR" />
         </component>
 
-        <component name="endQueuePosition" class="org.navalplanner.business.planner.entities.QueuePosition">
+        <component name="endQueuePosition" class="org.navalplanner.business.planner.limiting.entities.QueuePosition">
             <property name="date" column="END_DATE" type="org.joda.time.contrib.hibernate.PersistentLocalDate" />
             <property name="hour" column="END_HOUR" />
         </component>
@@ -103,20 +103,21 @@
         a LimitingResourceQueueElement -->
         <set name="dependenciesAsOrigin" cascade="none" lazy="false">
             <key column="origin_queue_element_id"/>
-            <one-to-many class="LimitingResourceQueueDependency"/>
+            <one-to-many class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency"/>
         </set>
 
         <!-- Indexed the other side. Useful to browse the input dependencies of
         a LimitingResourceQueueElement -->
         <set name="dependenciesAsDestiny" cascade="none" lazy="false">
             <key column="destiny_queue_element_id"/>
-            <one-to-many class="LimitingResourceQueueDependency"/>
+            <one-to-many class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency"/>
         </set>
 
     </class>
 
     <!-- LimitingResourceQueueDependency -->
-    <class name="LimitingResourceQueueDependency" table="limiting_resource_queue_dependency">
+    <class name="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency"
+     table="limiting_resource_queue_dependency">
         <id name="id" type="long" access="property">
             <generator class="hilo">
                 <param name="max_lo">100</param>
@@ -125,13 +126,13 @@
 
         <property name="type">
             <type name="org.hibernate.type.EnumType">
-                <param name="enumClass">org.navalplanner.business.planner.entities.LimitingResourceQueueDependency$QueueDependencyType</param>
+                <param name="enumClass">org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency$QueueDependencyType</param>
             </type>
         </property>
 
         <!--  Indexed -->
         <many-to-one name="hasAsOrigin" cascade="none"
-            class="org.navalplanner.business.planner.entities.LimitingResourceQueueElement"
+            class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement"
             column="origin_queue_element_id"
             not-null="false"
             index="idx_queuedependency_on_originqueue">
@@ -139,7 +140,7 @@
 
         <!-- Indexed -->
         <many-to-one name="hasAsDestiny" cascade="none"
-            class="org.navalplanner.business.planner.entities.LimitingResourceQueueElement"
+            class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement"
             column="destiny_queue_element_id"
             not-null="false"
             index="idx_queuedependency_on_destinyqueue"
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
index 2a914e131..aa1486a2b 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
@@ -88,7 +88,8 @@
             column="ORIGIN" />
         <many-to-one class="TaskElement" name="destination"
             column="DESTINATION" />
-        <many-to-one class="LimitingResourceQueueDependency" cascade="all"
+        <many-to-one class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency"
+            cascade="all"
             name="queueDependency"
             column="queue_dependency"
             unique="false"
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
index fa3e405bd..ed61a11f4 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
@@ -87,7 +87,7 @@
     <set name="limitingResourceQueueElements" cascade="all-delete-orphan" inverse="true"
             sort="org.navalplanner.business.resources.entities.LimitingResourceQueueElementComparator">
         <key column="LIMITING_RESOURCE_QUEUE_ID" not-null="true" />
-        <one-to-many class="org.navalplanner.business.planner.entities.LimitingResourceQueueElement" />
+        <one-to-many class="org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement" />
     </set>
 
   </class>
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/LimitingResourceQueueElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/LimitingResourceQueueElementDAOTest.java
index f4dd6cb30..3e6d8ba9e 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/LimitingResourceQueueElementDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/LimitingResourceQueueElementDAOTest.java
@@ -31,9 +31,9 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueDAO;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueElementDAO;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueDAO;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueElementDAO;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java
index 81f8b8992..f399277b5 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java
@@ -41,10 +41,10 @@ import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.orders.entities.OrderLine;
 import org.navalplanner.business.orders.entities.TaskSource;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ILimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ILimitingResourceQueueModel.java
index a31238f88..a9246243d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ILimitingResourceQueueModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ILimitingResourceQueueModel.java
@@ -23,10 +23,10 @@ package org.navalplanner.web.limitingresources;
 import java.util.List;
 
 import org.navalplanner.business.orders.entities.Order;
-import org.navalplanner.business.planner.entities.DateAndHour;
 import org.navalplanner.business.planner.entities.DayAssignment;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.business.planner.limiting.entities.DateAndHour;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.Interval;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
index dd076feed..c11b6b37b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
@@ -45,22 +45,22 @@ import org.navalplanner.business.orders.daos.IOrderElementDAO;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.planner.daos.IDependencyDAO;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueDAO;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueDependencyDAO;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueElementDAO;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
-import org.navalplanner.business.planner.entities.DateAndHour;
 import org.navalplanner.business.planner.entities.DayAssignment;
 import org.navalplanner.business.planner.entities.Dependency;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
-import org.navalplanner.business.planner.entities.LimitingResourceAllocator;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElementGap;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueDAO;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueDependencyDAO;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueElementDAO;
+import org.navalplanner.business.planner.limiting.entities.DateAndHour;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceAllocator;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElementGap;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionCompounder;
 import org.navalplanner.business.resources.entities.CriterionSatisfaction;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
index a42f8cf9c..5b0af18b1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
@@ -33,10 +33,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.navalplanner.business.resources.entities.Resource;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
index ef5313025..ff38f1f41 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
index 3158d23bd..50165f416 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
@@ -29,11 +29,11 @@ import java.util.Map;
 
 import org.apache.commons.lang.Validate;
 import org.joda.time.LocalDate;
-import org.navalplanner.business.planner.entities.DateAndHour;
-import org.navalplanner.business.planner.entities.LimitingResourceAllocator;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElementGap;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
+import org.navalplanner.business.planner.limiting.entities.DateAndHour;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceAllocator;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElementGap;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.navalplanner.business.resources.entities.Resource;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
index dca91434b..e1b142001 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
@@ -31,11 +31,11 @@ import java.util.SortedSet;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.zkoss.ganttz.DatesMapperOnInterval;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
index a28916f01..32d44561e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.entities.LimitingResourceQueue;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTask.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTask.java
index 45dc000a4..8ddd5cdd5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTask.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTask.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.joda.time.LocalDate;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ILimitingResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/ILimitingResourceAllocationModel.java
similarity index 91%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ILimitingResourceAllocationModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/ILimitingResourceAllocationModel.java
index 336c51db4..bed15a466 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ILimitingResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/ILimitingResourceAllocationModel.java
@@ -18,12 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner.allocation;
+package org.navalplanner.web.planner.limiting.allocation;
 
 import java.util.List;
 
 import org.navalplanner.business.orders.entities.AggregatedHoursGroup;
 import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.web.planner.allocation.INewAllocationsAdder;
 
 /**
  * Contract for {@link Task}.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingAllocationRow.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java
index adeafa8e5..f5eeecf58 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingAllocationRow.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.navalplanner.web.planner.allocation;
+package org.navalplanner.web.planner.limiting.allocation;
 
 import static org.navalplanner.business.i18n.I18nHelper._;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
index d35f5ce8e..da769752f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner.allocation;
+package org.navalplanner.web.planner.limiting.allocation;
 
 import java.util.Arrays;
 import java.util.List;
@@ -30,6 +30,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.common.components.NewAllocationSelector;
+import org.navalplanner.web.planner.allocation.ResourceAllocationController;
 import org.navalplanner.web.planner.allocation.ResourceAllocationController.HoursRendererColumn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java
index 7659e281a..09dbb8d28 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/LimitingResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner.allocation;
+package org.navalplanner.web.planner.limiting.allocation;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,9 +32,9 @@ import org.navalplanner.business.orders.entities.HoursGroup;
 import org.navalplanner.business.orders.entities.TaskSource;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
 import org.navalplanner.business.planner.daos.ITaskSourceDAO;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.resources.daos.ICriterionDAO;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Criterion;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
index 3a50bd59d..a3565f027 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
@@ -38,15 +38,12 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.planner.daos.IConsolidationDAO;
 import org.navalplanner.business.planner.daos.IDayAssignmentDAO;
-import org.navalplanner.business.planner.daos.ILimitingResourceQueueDependencyDAO;
 import org.navalplanner.business.planner.daos.ISubcontractedTaskDataDAO;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
 import org.navalplanner.business.planner.entities.DayAssignment;
 import org.navalplanner.business.planner.entities.Dependency;
 import org.navalplanner.business.planner.entities.DerivedAllocation;
 import org.navalplanner.business.planner.entities.DerivedDayAssignment;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency;
-import org.navalplanner.business.planner.entities.LimitingResourceQueueElement;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
@@ -57,6 +54,9 @@ import org.navalplanner.business.planner.entities.consolidations.ConsolidatedVal
 import org.navalplanner.business.planner.entities.consolidations.Consolidation;
 import org.navalplanner.business.planner.entities.consolidations.NonCalculatedConsolidatedValue;
 import org.navalplanner.business.planner.entities.consolidations.NonCalculatedConsolidation;
+import org.navalplanner.business.planner.limiting.daos.ILimitingResourceQueueDependencyDAO;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
+import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
 import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
index 8fe708f98..a46bc6ee1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
@@ -36,11 +36,11 @@ import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.planner.allocation.AllocationResult;
 import org.navalplanner.web.planner.allocation.FormBinder;
-import org.navalplanner.web.planner.allocation.LimitingResourceAllocationController;
 import org.navalplanner.web.planner.allocation.ResourceAllocationController;
 import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IAdvanceAllocationResultReceiver;
 import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction;
 import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction.IRestrictionSource;
+import org.navalplanner.web.planner.limiting.allocation.LimitingResourceAllocationController;
 import org.navalplanner.web.planner.order.PlanningState;
 import org.navalplanner.web.planner.order.SubcontractController;
 import org.navalplanner.web.planner.taskedition.TaskPropertiesController.ResourceAllocationTypeEnum;