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

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

Revision: 41
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=41&view=rev
Author:   roekens
Date:     2009-03-03 12:45:56 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
update for inheritance problem, and use of attributes

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java
    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/test/java/de/campussource/cse/cdmm/TestXmlConversion.java

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java	2009-03-03 10:48:08 UTC (rev 40)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java	2009-03-03 12:45:56 UTC (rev 41)
@@ -37,7 +37,7 @@
 	private de.campussource.cse.cdmm.Entity entity;
 	
 	
-	@XmlElement
+	@XmlElement()
 	public String getName() {
 		return name;
 	}

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:48:08 UTC (rev 40)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java	2009-03-03 12:45:56 UTC (rev 41)
@@ -9,6 +9,7 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessorOrder;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlID;
@@ -29,8 +30,8 @@
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
 
-    @XmlID
-    @XmlElement(name="id")
+    @XmlTransient
+    @Override
     public String getIdentityString( ) {
        return ( id != null ) ? id.toString() : "0";
     }

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-03 10:48:08 UTC (rev 40)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java	2009-03-03 12:45:56 UTC (rev 41)
@@ -54,6 +54,15 @@
 		
 		Group group = new Group();
 		group.setId(createUniqueId());
+		
+		Attribute att = new Attribute();
+		att.setName("testName");
+		att.setValue("testValue"); 
+		List<Attribute> atts = new ArrayList<Attribute>();
+		atts.add(att);
+		
+		group.setAttributes(atts);
+
 		List<Group> groups = new ArrayList<Group>();
 		groups.add(group);
 		
@@ -92,8 +101,9 @@
 		rols.add(role);
 		container.setRoles(rols);
 		
+
+				
 			
-			
 		try {
 			marshaller.marshal(container, System.out);
 


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