Changeset 227
- Timestamp:
- 03/15/10 18:18:05 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java
r226 r227 36 36 import javax.xml.bind.annotation.XmlRootElement; 37 37 import javax.xml.bind.annotation.XmlSeeAlso; 38 import javax.xml.bind.annotation.XmlTransient;39 38 import javax.xml.bind.annotation.XmlType; 40 39 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; … … 57 56 }) 58 57 @XmlRootElement(name = "VirtualCollection") 59 @XmlAccessorType(XmlAccessType. FIELD)58 @XmlAccessorType(XmlAccessType.NONE) 60 59 @XmlType(propOrder = { "name", "description", "creationDate", "visibility", 61 60 "type", "origin", "creator", "resources" }) … … 83 82 @GeneratedValue(strategy = GenerationType.AUTO) 84 83 @Column(name = "id") 85 @XmlAttribute(name = "id")86 84 private long id = -1; 87 85 @ManyToOne(cascade = { CascadeType.PERSIST, … … 90 88 fetch = FetchType.EAGER) 91 89 @JoinColumn(name = "owner_id", nullable = false) 92 @XmlTransient93 90 private User owner; 94 91 @Column(name = "pid", nullable = false) 95 @XmlAttribute(name = "persistentId")96 92 private String pid; 97 93 @Column(name = "name", nullable = false) 98 @XmlElement(name = "Name")99 94 private String name; 100 95 @Column(name = "description") 101 @XmlElement(name = "Description")102 96 private String description; 103 97 @Column(name = "creation_date") 104 98 @Temporal(TemporalType.DATE) 105 @XmlElement(name = "CreationDate")106 @XmlJavaTypeAdapter(DateAdapter.class)107 99 private Date creationDate; 108 100 @Column(name = "visibility") 109 101 @Enumerated(EnumType.ORDINAL) 110 @XmlElement(name = "Visibility")111 102 private Visibility visibility = Visibility.ADVERTISED; 112 103 @Column(name = "type") 113 104 @Enumerated(EnumType.ORDINAL) 114 @XmlElement(name = "Type")115 105 private Type type = Type.EXTENSIONAL; 116 106 @Column(name = "origin") 117 @XmlElement(name = "Origin")118 107 private String origin; 119 108 @Embedded 120 @XmlElement(name = "Creator")121 109 private Creator creator; 122 110 @OneToMany(cascade = CascadeType.ALL, … … 125 113 @JoinColumn(name = "vc_id", nullable = false) 126 114 @OrderBy("id") 127 @XmlElementWrapper(name = "Resources")128 @XmlElements({ @XmlElement(name = "Resource",129 type = Resource.class) })130 115 private Set<Resource> resources = new LinkedHashSet<Resource>(); 131 116 @Column(name = "created", nullable = false, updatable = false) 132 117 @Temporal(TemporalType.TIMESTAMP) 133 @XmlTransient134 118 private Date createdDate = new Date(); 135 119 @Column(name = "modified", nullable = false) 136 120 @Temporal(TemporalType.TIMESTAMP) 137 121 @Version 138 @XmlTransient139 122 private Date modifedDate; 140 123 124 @XmlAttribute(name = "id") 141 125 public long getId() { 142 126 return id; … … 165 149 } 166 150 151 @XmlAttribute(name = "persistentId") 167 152 public String getPid() { 168 153 return pid; … … 176 161 } 177 162 163 @XmlElement(name = "Name") 178 164 public String getName() { 179 165 return name; … … 184 170 } 185 171 172 @XmlElement(name = "Description") 186 173 public String getDescription() { 187 174 return description; … … 195 182 } 196 183 184 @XmlElement(name = "CreationDate") 185 @XmlJavaTypeAdapter(DateAdapter.class) 197 186 public Date getCreationDate() { 198 187 return creationDate; … … 206 195 } 207 196 197 @XmlElement(name = "Visibility") 208 198 public Visibility getVisibility() { 209 199 return visibility; … … 217 207 } 218 208 209 @XmlElement(name = "Type") 219 210 public Type getType() { 220 211 return type; … … 225 216 } 226 217 218 @XmlElement(name = "Origin") 227 219 public String getOrigin() { 228 220 return origin; … … 233 225 } 234 226 227 @XmlElement(name = "Creator") 235 228 public Creator getCreator() { 236 229 return creator; 237 230 } 238 231 232 @XmlElementWrapper(name = "Resources") 233 @XmlElements({ @XmlElement(name = "Resource", 234 type = Resource.class) }) 239 235 public Set<Resource> getResources() { 240 236 return resources;
Note: See TracChangeset
for help on using the changeset viewer.