RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr44S11CUImportarTraballoRealizadoPorSubcontrataItEr43S14: Moved web service DTOs and converter from orders package to common.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-01-22 08:16:36 +01:00 • committed by Javier Moran Rua
parent f6524634f7
commit dd0a43104a
16 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/AdvanceMeasurementDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/AdvanceMeasurementDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.math.BigDecimal;
import java.util.Date;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/CriterionRequirementDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/CriterionRequirementDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/DirectCriterionRequirementDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/DirectCriterionRequirementDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import javax.xml.bind.annotation.XmlRootElement;

3
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/HoursGroupDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.util.HashSet;
import java.util.Set;
@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
import org.navalplanner.business.orders.entities.HoursGroup;
import org.navalplanner.ws.common.api.ResourceEnumDTO;
/**
* DTO for {@link HoursGroup} entity.

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IndirectCriterionRequirementDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/LabelDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/LabelDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/MaterialAssignmentDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/MaterialAssignmentDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.math.BigDecimal;
import java.util.Date;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.util.Date;
import java.util.List;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderElementDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderElementDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.util.Date;
import java.util.HashSet;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.util.Date;
import java.util.HashSet;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineGroupDTO.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineGroupDTO.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.api;
package org.navalplanner.ws.common.api;
import java.util.ArrayList;
import java.util.Date;

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/ConfigurationOrderElementConverter.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ConfigurationOrderElementConverter.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.impl;
package org.navalplanner.ws.common.impl;
/**

25
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java → navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.ws.orders.impl;
package org.navalplanner.ws.common.impl;
import static org.navalplanner.web.I18nHelper._;
@ -56,20 +56,19 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen
import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.ResourceEnum;
import org.navalplanner.ws.common.api.AdvanceMeasurementDTO;
import org.navalplanner.ws.common.api.CriterionRequirementDTO;
import org.navalplanner.ws.common.api.DirectCriterionRequirementDTO;
import org.navalplanner.ws.common.api.HoursGroupDTO;
import org.navalplanner.ws.common.api.IncompatibleTypeException;
import org.navalplanner.ws.common.api.IndirectCriterionRequirementDTO;
import org.navalplanner.ws.common.api.LabelDTO;
import org.navalplanner.ws.common.api.MaterialAssignmentDTO;
import org.navalplanner.ws.common.api.OrderDTO;
import org.navalplanner.ws.common.api.OrderElementDTO;
import org.navalplanner.ws.common.api.OrderLineDTO;
import org.navalplanner.ws.common.api.OrderLineGroupDTO;
import org.navalplanner.ws.common.api.ResourceEnumDTO;
import org.navalplanner.ws.common.impl.ResourceEnumConverter;
import org.navalplanner.ws.orders.api.AdvanceMeasurementDTO;
import org.navalplanner.ws.orders.api.CriterionRequirementDTO;
import org.navalplanner.ws.orders.api.DirectCriterionRequirementDTO;
import org.navalplanner.ws.orders.api.HoursGroupDTO;
import org.navalplanner.ws.orders.api.IndirectCriterionRequirementDTO;
import org.navalplanner.ws.orders.api.LabelDTO;
import org.navalplanner.ws.orders.api.MaterialAssignmentDTO;
import org.navalplanner.ws.orders.api.OrderDTO;
import org.navalplanner.ws.orders.api.OrderElementDTO;
import org.navalplanner.ws.orders.api.OrderLineDTO;
import org.navalplanner.ws.orders.api.OrderLineGroupDTO;
/**
* Converter from/to {@link OrderElement} entities to/from DTOs.

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IOrderElementService.java
View file

@ -24,6 +24,8 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.ws.common.api.IncompatibleTypeException;
import org.navalplanner.ws.common.api.InstanceConstraintViolationsListDTO;
import org.navalplanner.ws.common.api.OrderDTO;
import org.navalplanner.ws.common.api.OrderElementDTO;
/**
* Service for managing {@link OrderElement} entities.

6
navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementServiceREST.java
View file

@ -39,11 +39,13 @@ import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.ws.common.api.IncompatibleTypeException;
import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO;
import org.navalplanner.ws.common.api.InstanceConstraintViolationsListDTO;
import org.navalplanner.ws.common.api.OrderDTO;
import org.navalplanner.ws.common.api.OrderElementDTO;
import org.navalplanner.ws.common.impl.ConfigurationOrderElementConverter;
import org.navalplanner.ws.common.impl.ConstraintViolationConverter;
import org.navalplanner.ws.common.impl.OrderElementConverter;
import org.navalplanner.ws.common.impl.Util;
import org.navalplanner.ws.orders.api.IOrderElementService;
import org.navalplanner.ws.orders.api.OrderDTO;
import org.navalplanner.ws.orders.api.OrderElementDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

20
navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
View file

@ -66,21 +66,21 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen
import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
import org.navalplanner.business.resources.entities.PredefinedCriterionTypes;
import org.navalplanner.business.resources.entities.ResourceEnum;
import org.navalplanner.ws.common.api.AdvanceMeasurementDTO;
import org.navalplanner.ws.common.api.ConstraintViolationDTO;
import org.navalplanner.ws.common.api.CriterionRequirementDTO;
import org.navalplanner.ws.common.api.DirectCriterionRequirementDTO;
import org.navalplanner.ws.common.api.HoursGroupDTO;
import org.navalplanner.ws.common.api.IncompatibleTypeException;
import org.navalplanner.ws.common.api.IndirectCriterionRequirementDTO;
import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO;
import org.navalplanner.ws.common.api.LabelDTO;
import org.navalplanner.ws.common.api.MaterialAssignmentDTO;
import org.navalplanner.ws.common.api.OrderDTO;
import org.navalplanner.ws.common.api.OrderLineDTO;
import org.navalplanner.ws.common.api.OrderLineGroupDTO;
import org.navalplanner.ws.common.api.ResourceEnumDTO;
import org.navalplanner.ws.orders.api.AdvanceMeasurementDTO;
import org.navalplanner.ws.orders.api.CriterionRequirementDTO;
import org.navalplanner.ws.orders.api.DirectCriterionRequirementDTO;
import org.navalplanner.ws.orders.api.HoursGroupDTO;
import org.navalplanner.ws.orders.api.IOrderElementService;
import org.navalplanner.ws.orders.api.IndirectCriterionRequirementDTO;
import org.navalplanner.ws.orders.api.LabelDTO;
import org.navalplanner.ws.orders.api.MaterialAssignmentDTO;
import org.navalplanner.ws.orders.api.OrderDTO;
import org.navalplanner.ws.orders.api.OrderLineDTO;
import org.navalplanner.ws.orders.api.OrderLineGroupDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;