diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeDTO.java index a96401a63..3070f303f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeDTO.java @@ -22,6 +22,7 @@ package org.navalplanner.ws.calendarexceptiontypes.api; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.business.calendars.entities.CalendarExceptionType; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -31,6 +32,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * * @author Manuel Rego Casasnovas */ +@XmlRootElement(name = "calendar-exception-type") public class CalendarExceptionTypeDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "calendar-exception-type"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java index b13c78d34..6e87c1057 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Set; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.datatype.XMLGregorianCalendar; import org.navalplanner.business.orders.entities.Order; @@ -34,7 +35,7 @@ import org.navalplanner.business.orders.entities.Order; * * @author Manuel Rego Casasnovas */ - +@XmlRootElement(name = "order") public class OrderDTO extends OrderLineGroupDTO { public final static String ENTITY_TYPE = "order"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/api/CostCategoryDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/api/CostCategoryDTO.java index d9195e437..03e12c007 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/api/CostCategoryDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/api/CostCategoryDTO.java @@ -27,6 +27,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.business.costcategories.entities.CostCategory; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -35,6 +36,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * DTO for {@link CostCategory} entity. * @author Susana Montes Pedreira */ +@XmlRootElement(name = "cost-category") public class CostCategoryDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "cost-category"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/api/LabelTypeDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/api/LabelTypeDTO.java index 82b9f6092..2a5ee935e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/api/LabelTypeDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/api/LabelTypeDTO.java @@ -27,6 +27,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.business.labels.entities.LabelType; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -36,6 +37,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * * @author Manuel Rego Casasnovas */ +@XmlRootElement(name = "label-type") public class LabelTypeDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "label-type"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java index dcbc6b4a2..95c099acd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java @@ -27,6 +27,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -34,6 +35,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * DTO for MaterialCategory entity. * @author Susana Montes Pedreira */ +@XmlRootElement(name = "material-category") public class MaterialCategoryDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "material-category"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/MachineDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/MachineDTO.java index 1a2a86b58..a0153cffd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/MachineDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/MachineDTO.java @@ -22,12 +22,14 @@ package org.navalplanner.ws.resources.api; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; /** * DTO for Machine entity. * * @author Fernando Bellas Permuy */ +@XmlRootElement(name = "machine") public class MachineDTO extends ResourceDTO { public final static String ENTITY_TYPE = "machine"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/WorkerDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/WorkerDTO.java index 80db7ba10..aec11bf8d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/WorkerDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/api/WorkerDTO.java @@ -22,12 +22,14 @@ package org.navalplanner.ws.resources.api; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; /** * DTO for Worker entity. * * @author Fernando Bellas Permuy */ +@XmlRootElement(name = "worker") public class WorkerDTO extends ResourceDTO { public final static String ENTITY_TYPE = "worker"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/api/CriterionTypeDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/api/CriterionTypeDTO.java index af21f8c73..c04c30a0e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/api/CriterionTypeDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/api/CriterionTypeDTO.java @@ -27,6 +27,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.ws.common.api.IntegrationEntityDTO; import org.navalplanner.ws.common.api.ResourceEnumDTO; @@ -36,6 +37,7 @@ import org.navalplanner.ws.common.api.ResourceEnumDTO; * * @author Fernando Bellas Permuy */ +@XmlRootElement(name = "criterion-type") public class CriterionTypeDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "criterion-type"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/typeofworkhours/api/TypeOfWorkHoursDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/typeofworkhours/api/TypeOfWorkHoursDTO.java index 323ad7811..e40568bdc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/typeofworkhours/api/TypeOfWorkHoursDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/typeofworkhours/api/TypeOfWorkHoursDTO.java @@ -24,6 +24,7 @@ package org.navalplanner.ws.typeofworkhours.api; import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.business.costcategories.entities.TypeOfWorkHours; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -32,6 +33,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * DTO for {@link TypeOfWorkHours} entity. * @author Susana Montes Pedreira */ +@XmlRootElement(name = "type-work-hours") public class TypeOfWorkHoursDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "type-work-hours"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/unittypes/api/UnitTypeDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/unittypes/api/UnitTypeDTO.java index a3639a715..0d3824367 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/unittypes/api/UnitTypeDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/unittypes/api/UnitTypeDTO.java @@ -22,6 +22,7 @@ package org.navalplanner.ws.unittypes.api; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; import org.navalplanner.ws.common.api.IntegrationEntityDTO; @@ -29,6 +30,7 @@ import org.navalplanner.ws.common.api.IntegrationEntityDTO; * DTO for UnitType entity. * @author Susana Montes Pedreira */ +@XmlRootElement(name = "unit-type") public class UnitTypeDTO extends IntegrationEntityDTO { public final static String ENTITY_TYPE = "unit type";