diff --git a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Identifier.java b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Identifier.java index 891c0815c7bfb0908b115c6b7fa06a521b9a7dad..0c6eae78a6191d2a4da25f39fa5609369c3fbb89 100644 --- a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Identifier.java +++ b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Identifier.java @@ -10,11 +10,13 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import com.fasterxml.jackson.annotation.JsonIgnore; -@Entity +@Entity(name="Identifier") +@XmlRootElement(name = "identifier", namespace = "http://entities.domain.xcs.esei.uvigo.es") public class Identifier { @Id @Column(length = 32, nullable = false) diff --git a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Pet.java b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Pet.java index 2a8ca46de0284701d6cfe3ece02ebeaee0257118..c344c92ae380c549ddd3b6a9afca404a348b8741 100644 --- a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Pet.java +++ b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Pet.java @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlTransient; @Entity(name = "Pet") -@XmlRootElement(name = "pett", namespace = "http://entities.domain.xcs.esei.uvigo.es") +@XmlRootElement(name = "pet", namespace = "http://entities.domain.xcs.esei.uvigo.es") @XmlAccessorType(XmlAccessType.FIELD) public class Pet implements Serializable { private static final long serialVersionUID = 1L; diff --git a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vaccination.java b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vaccination.java index c373cca1a85d28e3957e19010cbe60b0baa38692..26c172a5fe7d1e793e4a75671a778c2a45a54edd 100644 --- a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vaccination.java +++ b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vaccination.java @@ -13,11 +13,13 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import com.fasterxml.jackson.annotation.JsonIgnore; -@Entity +@Entity(name="Vaccination") +@XmlRootElement(name = "vaccination", namespace = "http://entities.domain.xcs.esei.uvigo.es") public class Vaccination implements Serializable { private static final long serialVersionUID = 1L; diff --git a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vet.java b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vet.java index 9395dbbaa5be0626276a542854831282d6085396..12e5ea85b65e0631f3b6e32371e5deb539b18420 100644 --- a/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vet.java +++ b/domain/src/main/java/es/uvigo/esei/xcs/domain/entities/Vet.java @@ -12,9 +12,11 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.ManyToMany; +import javax.xml.bind.annotation.XmlRootElement; @Entity @DiscriminatorValue("VET") +@XmlRootElement(name = "vet", namespace = "http://entities.domain.xcs.esei.uvigo.es") public class Vet extends User implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetDetailsManagedBean.java b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetDetailsManagedBean.java index 48d30183a027387693e6f6ff966858f7ce2322b9..d0a0de66b69c5ace2cd43f552ca4b616b376f1bb 100644 --- a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetDetailsManagedBean.java +++ b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetDetailsManagedBean.java @@ -1,7 +1,6 @@ package es.uvigo.esei.xcs.jsf; import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; import javax.faces.context.FacesContext; diff --git a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/VaccineManagedBean.java b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/VaccineManagedBean.java index 7d7d7c161988a42c8de4a5d40aeb5e57a6d99a2f..c2b7df9bfc99a3e2b53dca20f4b795aa139705e2 100644 --- a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/VaccineManagedBean.java +++ b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/VaccineManagedBean.java @@ -37,6 +37,7 @@ public class VaccineManagedBean{ vaccineService.remove(id); vaccines = vaccineService.list(0, 100); } + private void clearForm() { name = null; diff --git a/jsf/src/main/webapp/admin/owners.xhtml b/jsf/src/main/webapp/admin/owners.xhtml index 050be53cc1617a8745817b408035cf4c546e951c..77f57f59f796c79c82f57b0bd65e6271221ea975 100644 --- a/jsf/src/main/webapp/admin/owners.xhtml +++ b/jsf/src/main/webapp/admin/owners.xhtml @@ -1,4 +1,4 @@ - +w