[Cse-ip-svn-commits] SF.net SVN: cse-ip:[48] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src

[<ro...@us...>]

Revision: 48
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=48&view=rev
Author:   roekens
Date:     2009-03-04 12:12:29 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
defined structural xml changes, 
categories are defined in hierarchy in xml, and roles are defined as parts of courses

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java	2009-03-04 11:56:09 UTC (rev 47)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java	2009-03-04 12:12:29 UTC (rev 48)
@@ -35,7 +35,6 @@
 
 	@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/domain/EntityContainer.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java	2009-03-04 11:56:09 UTC (rev 47)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java	2009-03-04 12:12:29 UTC (rev 48)
@@ -31,10 +31,6 @@
 	@XmlElement(name="course")
 	private List<Course> courses;
 	
-	@XmlElementWrapper(name="roles")
-	@XmlElementRef(name="role")
-	private List<Role> roles;
-	
 	@XmlElementWrapper(name="accounts")
 	@XmlElements(value= {@XmlElement(name="account",type=Account.class),@XmlElement(name="group",type=Group.class)})
 	private List<Account> accounts;
@@ -59,10 +55,6 @@
 		this.courses = courses;
 	}
 
-	public void setRoles(List<Role> roles) {
-		this.roles = roles;
-	}
-
 	public void setAccounts(List<Account> accounts) {
 		this.accounts = accounts;
 	}
@@ -91,10 +83,6 @@
 		return courses;
 	}
 
-	@XmlTransient
-	public List<Role> getRoles() {
-		return roles;
-	}
 
 	@XmlTransient
 	public List<Account> getAccounts() {
@@ -108,7 +96,7 @@
 
 	@Override
 	public String toString() {
-		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE).append(categories.toArray()).append(courses.toArray()).append(accounts.toArray()).append(roles.toArray()).append(groups.toArray()).toString();
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE).append(categories.toArray()).append(courses.toArray()).append(accounts.toArray()).append(groups.toArray()).toString();
 	}
 	
 	

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java	2009-03-04 11:56:09 UTC (rev 47)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java	2009-03-04 12:12:29 UTC (rev 48)
@@ -112,13 +112,16 @@
 
 		Category categoryB = new Category();
 		categoryB.setId(createUniqueId());
-		List<Category> categories = new ArrayList<Category>();
-		categories.add(categoryA);
-		categoryB.setParents(categories);
+		List<Category> parentCategory = new ArrayList<Category>();
+		parentCategory.add(categoryA);
+		List<Category> childCategory = new ArrayList<Category>();
+		childCategory.add(categoryB);
+		categoryB.setParents(parentCategory);
+		categoryA.setChildren(childCategory);
 		
 		Course course = new Course();
 		course.setId(createUniqueId());
-		course.setCategories(categories);
+		course.setCategories(parentCategory);
 				
 		List<Course> cl = new ArrayList<Course>(); cl.add(course);
 		categoryA.setCourses(cl);
@@ -162,7 +165,7 @@
 		container.setAccounts(accs);
 
 		List<Category> cats = new ArrayList<Category>();
-		cats.add(categoryA); cats.add(categoryB);
+		cats.add(categoryA); 
 		container.setCategories(cats);
 		
 		List<Course> cous = new ArrayList<Course>();
@@ -173,9 +176,6 @@
 		grps.add(group);
 		container.setGroups(grps);
 
-		List<Role> rols = new ArrayList<Role>();
-		rols.add(role);
-		container.setRoles(rols);
 		return container;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.