[Cse-ip-svn-commits] SF.net SVN: cse-ip:[57] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/ de/campussource/cse/cdmm/domain

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

Revision: 57
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=57&view=rev
Author:   roekens
Date:     2009-03-05 13:19:06 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
several bugfixes for xml structure

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java	2009-03-05 13:09:43 UTC (rev 56)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java	2009-03-05 13:19:06 UTC (rev 57)
@@ -85,7 +85,7 @@
 	}
 
 	@XmlElementWrapper(name=Constants.CATEGORIES)
-	@XmlElement(name=Constants.CATEGORY, required=true)
+	@XmlElement(name=Constants.CATEGORY)
 	@XmlIDREF
 	public List<Category> getCategories() {
 		return categories;

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java	2009-03-05 13:09:43 UTC (rev 56)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java	2009-03-05 13:19:06 UTC (rev 57)
@@ -4,7 +4,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -63,7 +63,7 @@
 
 	@XmlID
     @XmlJavaTypeAdapter(value=IdAdapter.class)
-    @XmlAttribute(name=Constants.ID)
+    @XmlElement(name=Constants.ID)
 	public Long getId() {
 		return id;
 	};

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java	2009-03-05 13:09:43 UTC (rev 56)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java	2009-03-05 13:19:06 UTC (rev 57)
@@ -51,7 +51,7 @@
 		setId(id);
 	}
 
-	@XmlElement
+	@XmlElement(name=Constants.TYPE)
 	public RoleType getType() {
 		return type;
 	}


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