From 3501d6da859dd81f8f0541da8e793a4e0e23adf5 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 3 Aug 2009 13:52:05 +0200 Subject: [PATCH] ItEr20S04ArquitecturaServidorItEr19S04: Removed "*.impl" packages. --- .../business/advance/daos/AdvanceAssigmentDAO.java | 2 +- .../business/advance/daos/AdvanceMeasurementDAO.java | 2 +- .../navalplanner/business/advance/daos/AdvanceTypeDAO.java | 2 +- .../common/daos/{impl => }/GenericDAOHibernate.java | 3 +-- .../navalplanner/business/orders/daos/HoursGroupDAO.java | 2 +- .../org/navalplanner/business/orders/daos/OrderDAO.java | 2 +- .../navalplanner/business/orders/daos/OrderElementDAO.java | 2 +- .../business/planner/daos/ResourceAllocationDAO.java | 2 +- .../navalplanner/business/planner/daos/TaskElementDAO.java | 2 +- .../business/resources/daos/{impl => }/CriterionDAO.java | 5 ++--- .../daos/{impl => }/CriterionSatisfactionDAO.java | 5 ++--- .../resources/daos/{impl => }/CriterionTypeDAO.java | 5 ++--- .../business/resources/daos/ICriterionDAO.java | 1 - .../business/resources/daos/ICriterionTypeDAO.java | 1 - .../resources/daos/{impl => }/ResourceDAOHibernate.java | 5 ++--- .../resources/daos/{impl => }/WorkerDAOHibernate.java | 5 ++--- .../services/{impl => }/CriterionServiceImpl.java | 7 ++----- .../services/{impl => }/CriterionTypeServiceImpl.java | 5 ++--- .../resources/services/{impl => }/ResourceServiceImpl.java | 4 +--- .../business/workreports/daos/WorkReportDAO.java | 2 +- .../business/workreports/daos/WorkReportLineDAO.java | 2 +- .../business/workreports/daos/WorkReportTypeDAO.java | 2 +- .../test/resources/daos/CriterionSatisfactionDAOTest.java | 2 +- .../test/workreports/daos/AbstractWorkReportTest.java | 4 ++-- .../org/navalplanner/web/workreports/WorkReportModel.java | 2 +- 25 files changed, 31 insertions(+), 45 deletions(-) rename navalplanner-business/src/main/java/org/navalplanner/business/common/daos/{impl => }/GenericDAOHibernate.java (98%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/{impl => }/CriterionDAO.java (93%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/{impl => }/CriterionSatisfactionDAO.java (74%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/{impl => }/CriterionTypeDAO.java (90%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/{impl => }/ResourceDAOHibernate.java (73%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/{impl => }/WorkerDAOHibernate.java (86%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/services/{impl => }/CriterionServiceImpl.java (96%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/services/{impl => }/CriterionTypeServiceImpl.java (92%) rename navalplanner-business/src/main/java/org/navalplanner/business/resources/services/{impl => }/ResourceServiceImpl.java (93%) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceAssigmentDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceAssigmentDAO.java index e67a56064..e08671f0a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceAssigmentDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceAssigmentDAO.java @@ -1,7 +1,7 @@ package org.navalplanner.business.advance.daos; import org.navalplanner.business.advance.entities.AdvanceAssigment; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; 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/advance/daos/AdvanceMeasurementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java index af2fca58a..b0ba177ad 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.advance.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.advance.entities.AdvanceMeasurement; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceTypeDAO.java index 139e69dd3..3c2c635a5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceTypeDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.advance.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.advance.entities.AdvanceType; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/impl/GenericDAOHibernate.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java similarity index 98% rename from navalplanner-business/src/main/java/org/navalplanner/business/common/daos/impl/GenericDAOHibernate.java rename to navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java index efb3a7e82..3c869e51d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/impl/GenericDAOHibernate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/daos/GenericDAOHibernate.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.common.daos.impl; +package org.navalplanner.business.common.daos; import java.io.Serializable; import java.lang.reflect.Method; @@ -13,7 +13,6 @@ import org.hibernate.SessionFactory; import org.hibernate.StaleObjectStateException; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/HoursGroupDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/HoursGroupDAO.java index ba0d60bb8..380289c39 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/HoursGroupDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/HoursGroupDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.orders.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.orders.entities.HoursGroup; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java index 36f6e911a..374645591 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.orders.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.orders.entities.Order; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java index 814bf0169..6438ba7fb 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.orders.entities.OrderElement; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ResourceAllocationDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ResourceAllocationDAO.java index 5f3a8a64a..6f6521225 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ResourceAllocationDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ResourceAllocationDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.planner.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java index 22b83d41b..00b06ee00 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.planner.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.planner.entities.TaskElement; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java similarity index 93% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionDAO.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java index 23a3f498e..ea08ac3e5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.resources.daos.impl; +package org.navalplanner.business.resources.daos; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,8 @@ import org.hibernate.Criteria; import org.hibernate.Hibernate; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.resources.daos.ICriterionDAO; import org.navalplanner.business.resources.entities.Criterion; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionSatisfactionDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionSatisfactionDAO.java similarity index 74% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionSatisfactionDAO.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionSatisfactionDAO.java index 91468bcc8..d2e34687b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionSatisfactionDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionSatisfactionDAO.java @@ -1,7 +1,6 @@ -package org.navalplanner.business.resources.daos.impl; +package org.navalplanner.business.resources.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; -import org.navalplanner.business.resources.daos.ICriterionSatisfactionDAO; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.resources.entities.CriterionSatisfaction; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java similarity index 90% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionTypeDAO.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java index d39add140..11ef5f7fd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/CriterionTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java @@ -1,12 +1,11 @@ -package org.navalplanner.business.resources.daos.impl; +package org.navalplanner.business.resources.daos; import java.util.List; import org.apache.commons.lang.Validate; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.resources.daos.ICriterionTypeDAO; import org.navalplanner.business.resources.entities.CriterionType; import org.springframework.stereotype.Component; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java index 8e8784da5..d069a7016 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java @@ -3,7 +3,6 @@ package org.navalplanner.business.resources.daos; import java.util.List; import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.resources.daos.impl.CriterionDAO; import org.navalplanner.business.resources.entities.Criterion; /** diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java index 160ae7842..13dc92340 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java @@ -3,7 +3,6 @@ package org.navalplanner.business.resources.daos; import java.util.List; import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.resources.daos.impl.CriterionTypeDAO; import org.navalplanner.business.resources.entities.CriterionType; /** diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/ResourceDAOHibernate.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAOHibernate.java similarity index 73% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/ResourceDAOHibernate.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAOHibernate.java index 0b26dfb6c..177997d2b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/ResourceDAOHibernate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAOHibernate.java @@ -1,7 +1,6 @@ -package org.navalplanner.business.resources.daos.impl; +package org.navalplanner.business.resources.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; -import org.navalplanner.business.resources.daos.IResourceDAO; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.resources.entities.Resource; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/WorkerDAOHibernate.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAOHibernate.java similarity index 86% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/WorkerDAOHibernate.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAOHibernate.java index 450509f16..6de8d1ff7 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/impl/WorkerDAOHibernate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAOHibernate.java @@ -1,12 +1,11 @@ -package org.navalplanner.business.resources.daos.impl; +package org.navalplanner.business.resources.daos; import java.util.List; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; -import org.navalplanner.business.resources.daos.IWorkerDAO; import org.navalplanner.business.resources.entities.Worker; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionServiceImpl.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionServiceImpl.java similarity index 96% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionServiceImpl.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionServiceImpl.java index 5209d73f2..48dad2ead 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionServiceImpl.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionServiceImpl.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.resources.services.impl; +package org.navalplanner.business.resources.services; import java.util.ArrayList; import java.util.Collection; @@ -10,8 +10,8 @@ import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.IOnTransaction; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; +import org.navalplanner.business.resources.daos.CriterionDAO; import org.navalplanner.business.resources.daos.ICriterionDAO; -import org.navalplanner.business.resources.daos.impl.CriterionDAO; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionSatisfaction; import org.navalplanner.business.resources.entities.CriterionType; @@ -20,9 +20,6 @@ import org.navalplanner.business.resources.entities.ICriterionOnData; import org.navalplanner.business.resources.entities.ICriterionType; import org.navalplanner.business.resources.entities.Interval; import org.navalplanner.business.resources.entities.Resource; -import org.navalplanner.business.resources.services.ICriterionService; -import org.navalplanner.business.resources.services.ICriterionTypeService; -import org.navalplanner.business.resources.services.IResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.ApplicationContext; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionTypeServiceImpl.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java similarity index 92% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionTypeServiceImpl.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java index 0bbaba098..31b46e6a6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/CriterionTypeServiceImpl.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java @@ -1,14 +1,13 @@ -package org.navalplanner.business.resources.services.impl; +package org.navalplanner.business.resources.services; import java.util.List; import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; +import org.navalplanner.business.resources.daos.CriterionTypeDAO; import org.navalplanner.business.resources.daos.ICriterionTypeDAO; -import org.navalplanner.business.resources.daos.impl.CriterionTypeDAO; import org.navalplanner.business.resources.entities.CriterionType; -import org.navalplanner.business.resources.services.ICriterionTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/ResourceServiceImpl.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ResourceServiceImpl.java similarity index 93% rename from navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/ResourceServiceImpl.java rename to navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ResourceServiceImpl.java index 8a093b098..cc309f00a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/impl/ResourceServiceImpl.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ResourceServiceImpl.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.resources.services.impl; +package org.navalplanner.business.resources.services; import java.util.HashSet; import java.util.List; @@ -11,8 +11,6 @@ import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.ICriterion; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.Worker; -import org.navalplanner.business.resources.services.ICriterionTypeService; -import org.navalplanner.business.resources.services.IResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java index 067310ab0..3ef4c5aa3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.workreports.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.workreports.entities.WorkReport; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportLineDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportLineDAO.java index 379b19666..df59339db 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportLineDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportLineDAO.java @@ -4,7 +4,7 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.workreports.entities.WorkReportLine; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportTypeDAO.java index b224a93eb..5f1c23e71 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportTypeDAO.java @@ -1,6 +1,6 @@ package org.navalplanner.business.workreports.daos; -import org.navalplanner.business.common.daos.impl.GenericDAOHibernate; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.workreports.entities.WorkReportType; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/CriterionSatisfactionDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/CriterionSatisfactionDAOTest.java index 21bb122b5..468fac5cb 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/CriterionSatisfactionDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/CriterionSatisfactionDAOTest.java @@ -9,7 +9,7 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.resources.daos.ICriterionDAO; import org.navalplanner.business.resources.daos.ICriterionSatisfactionDAO; import org.navalplanner.business.resources.daos.ICriterionTypeDAO; -import org.navalplanner.business.resources.daos.impl.WorkerDAOHibernate; +import org.navalplanner.business.resources.daos.WorkerDAOHibernate; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionSatisfaction; import org.navalplanner.business.resources.entities.CriterionType; diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java index 96a165df7..4df1d9bf6 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java @@ -8,8 +8,8 @@ import java.util.UUID; import org.navalplanner.business.orders.daos.OrderElementDAO; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.orders.entities.OrderLine; -import org.navalplanner.business.resources.daos.impl.CriterionTypeDAO; -import org.navalplanner.business.resources.daos.impl.ResourceDAOHibernate; +import org.navalplanner.business.resources.daos.CriterionTypeDAO; +import org.navalplanner.business.resources.daos.ResourceDAOHibernate; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.business.resources.entities.Worker; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java index 43768fba3..5d3b1bef5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java @@ -10,7 +10,7 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.orders.daos.OrderElementDAO; import org.navalplanner.business.orders.entities.OrderElement; -import org.navalplanner.business.resources.daos.impl.WorkerDAOHibernate; +import org.navalplanner.business.resources.daos.WorkerDAOHibernate; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.Resource;