Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[40] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/ de/campussource/cse/cdmm
|
From: <ro...@us...> - 2009-03-03 10:48:17
|
Revision: 40
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=40&view=rev
Author: roekens
Date: 2009-03-03 10:48:08 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
added elementwrapper to wrap list elements in xml for nicer xml structure
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -13,6 +13,7 @@
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlTransient;
@@ -84,7 +85,8 @@
this.id = id;
}
- @XmlElement
+ @XmlElementWrapper(name="roles")
+ @XmlElement(name="role")
@XmlIDREF
public List<Role> getRoles() {
return roles;
@@ -94,7 +96,8 @@
this.roles = roles;
}
- @XmlElement
+ @XmlElementWrapper(name="groups")
+ @XmlElement(name="group")
@XmlIDREF
public List<Group> getGroups() {
return groups;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -12,6 +12,7 @@
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlTransient;
@@ -88,7 +89,8 @@
this.id = id;
}
- @XmlElement
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
public List<Category> getChildren() {
return children;
}
@@ -97,7 +99,8 @@
this.children = children;
}
- @XmlElement
+ @XmlElementWrapper(name="courses")
+ @XmlElement(name="course")
@XmlIDREF
public List<Course> getCourses() {
return courses;
@@ -107,7 +110,8 @@
this.courses = courses;
}
- @XmlElement
+ @XmlElementWrapper(name="parents")
+ @XmlElement(name="parent")
@XmlIDREF
public List<Category> getParents() {
return parents;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -14,6 +14,7 @@
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlTransient;
@@ -37,9 +38,6 @@
return ( id != null ) ? id.toString() : "0";
}
- @OneToMany(mappedBy="course")
- private List<Account> members;
-
@ManyToOne
@JoinTable(name="PARENT_ID")
private Course parent;
@@ -94,16 +92,6 @@
@XmlElement
@XmlIDREF
- public List<Account> getMembers() {
- return members;
- }
-
- public void setMembers(List<Account> members) {
- this.members = members;
- }
-
- @XmlElement
- @XmlIDREF
public Course getParent() {
return parent;
}
@@ -112,7 +100,8 @@
this.parent = parent;
}
- @XmlElement
+ @XmlElementWrapper(name="workgroups")
+ @XmlElement(name="workgroup")
public List<Course> getWorkgroups() {
return workgroups;
}
@@ -121,7 +110,8 @@
this.workgroups = workgroups;
}
- @XmlElement
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
@XmlIDREF
public List<Category> getCategories() {
return categories;
@@ -131,7 +121,8 @@
this.categories = categories;
}
- @XmlElement
+ @XmlElementWrapper(name="roles")
+ @XmlElement(name="role")
@XmlIDREF
public List<Role> getRoles() {
return roles;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -7,7 +7,7 @@
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlTransient;
public class Entity{
@@ -18,9 +18,11 @@
private Long id;
@OneToMany(mappedBy="entity")
+ @XmlTransient
private List<Attribute> attributes;
- @XmlElement
+ @XmlElementWrapper(name="attributes")
+ @XmlElement(name="attribute")
public List<Attribute> getAttributes(){
return attributes;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -3,30 +3,39 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
@XmlRootElement
public class EntityContainer{
- @XmlElement
+ @XmlElementWrapper(name="entities")
+ @XmlElement(name="entity")
private List<Entity> entities;
- @XmlElement
+ @XmlElementWrapper(name="attributes")
+ @XmlElement(name="attribute")
private List<Attribute> attributes;
- @XmlElement
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
private List<Category> categories;
- @XmlElement
+ @XmlElementWrapper(name="courses")
+ @XmlElement(name="course")
private List<Course> courses;
- @XmlElement
+ @XmlElementWrapper(name="roles")
+ @XmlElement(name="role")
private List<Role> roles;
- @XmlElement
+ @XmlElementWrapper(name="accounts")
+ @XmlElement(name="account")
private List<Account> accounts;
- @XmlElement
+ @XmlElementWrapper(name="groups")
+ @XmlElement(name="group")
private List<Group> groups;
public void setEntities(List<Entity> entities) {
@@ -56,5 +65,40 @@
public void setGroups(List<Group> groups) {
this.groups = groups;
}
+
+ @XmlTransient
+ public List<Entity> getEntities() {
+ return entities;
+ }
+
+ @XmlTransient
+ public List<Attribute> getAttributes() {
+ return attributes;
+ }
+
+ @XmlTransient
+ public List<Category> getCategories() {
+ return categories;
+ }
+
+ @XmlTransient
+ public List<Course> getCourses() {
+ return courses;
+ }
+
+ @XmlTransient
+ public List<Role> getRoles() {
+ return roles;
+ }
+
+ @XmlTransient
+ public List<Account> getAccounts() {
+ return accounts;
+ }
+
+ @XmlTransient
+ public List<Group> getGroups() {
+ return groups;
+ }
}
\ No newline at end of file
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-03 10:08:44 UTC (rev 39)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-03 10:48:08 UTC (rev 40)
@@ -10,6 +10,7 @@
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlTransient;
@@ -34,8 +35,7 @@
return ( id != null ) ? id.toString() : "0";
}
- @XmlElement
- @XmlIDREF()
+ @XmlTransient
@ManyToMany(mappedBy="groups")
public List<Account> members;
@@ -77,4 +77,11 @@
public void setId(Long id) {
this.id = id;
}
+
+ @XmlElementWrapper(name="members")
+ @XmlElement(name="member")
+ @XmlIDREF
+ public List<Account> getMembers() {
+ return members;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
