Menu
▾
▴
cse-ip-svn-commits — SVN Commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
(28) |
Mar
(85) |
Apr
(81) |
May
(32) |
Jun
(51) |
Jul
(134) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <ro...@us...> - 2009-03-06 13:29:48
|
Revision: 62
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=62&view=rev
Author: roekens
Date: 2009-03-06 13:29:28 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
- introduction of new attribute structure
where conversion to xml works fine, conversion back to java objects does not work yet -> espescially not the distinction of persistent and transient objects
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.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/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-06 10:11:09 UTC (rev 61)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -29,11 +29,17 @@
public static final String ACCOUNT_ID = "accountId";
public static final String GROUP_ID = "groupId";
public static final String MEMBER = "member";
+ public static final String ATTRIBUTE = "attribute";
+ public static final String ATTRIBUTES = "attributes";
//entity property names
+ public static final String PROPERTY_ATTRIBUTES = "attributes";
public static final String PROPERTY_PARENTS = "parents";
public static final String PROPERTY_CHILDREN = "children";
public static final String PROPERTY_COURSES = "courses";
+ public static final String PROPERTY_NAME = "name";
+ public static final String PROPERTY_VALUE = "value";
+ public static final String PROPERTY_PERSISTENT = "peristent";
//table names
public static final String TABLENAME_ACCOUNT = "CDMM_ACCOUNT";
@@ -57,4 +63,7 @@
public static final String ID = "id";
+
+
+
}
\ No newline at end of file
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -0,0 +1,58 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.persistence.Embeddable;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+import de.campussource.cse.cdmm.Constants;
+
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
+@Embeddable
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+public class Attribute {
+
+ private String name;
+
+ private String value;
+
+ private boolean persistent;
+
+ public Attribute(){
+ }
+
+ public Attribute(String name, String value, boolean persistent){
+ this.name = name;
+ this.value = value;
+ this.persistent = persistent;
+ }
+
+ @XmlAttribute(name=Constants.PROPERTY_PERSISTENT)
+ public boolean isPersistent() {
+ return persistent;
+ }
+
+ public void setPersistent(boolean persistent) {
+ this.persistent = persistent;
+ }
+
+ @XmlAttribute(name=Constants.PROPERTY_NAME)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @XmlValue
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-06 10:11:09 UTC (rev 61)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -1,13 +1,15 @@
package de.campussource.cse.cdmm.domain;
+import java.util.ArrayList;
import java.util.List;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -20,15 +22,15 @@
import de.campussource.cse.cdmm.IdAdapter;
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.ID, "any"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.ID, Constants.PROPERTY_ATTRIBUTES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- private List<Object> any;
-
+ private List<Attribute> attributes;
+
public Entity(){
}
@@ -73,12 +75,25 @@
return id;
}
- @XmlAnyElement
- public List<Object> getAny() {
- return any;
+ @XmlElementWrapper(name=Constants.ATTRIBUTES)
+ @XmlElements(value={@XmlElement(name=Constants.ATTRIBUTE,type=Attribute.class), @XmlElement(name=Constants.ATTRIBUTE,type=TransientAttribute.class), @XmlElement(name=Constants.ATTRIBUTE, type=PersistentAttribute.class)})
+ public List<Attribute> getAttributes() {
+ return attributes;
}
- public void setAny(List<Object> any) {
- this.any = any;
- };
+ private TransientAttribute attribute2TransientAttribute(Attribute attribute){
+ return new TransientAttribute(attribute.getName(), attribute.getValue());
+ }
+
+ private PersistentAttribute attribute2PersistentAttribute(Attribute attribute){
+ return new PersistentAttribute(attribute.getName(), attribute.getValue());
+ }
+
+ public void setAttributes(List<Attribute> attributes) {
+ List<Attribute> newAttributeList = new ArrayList<Attribute>();
+ for (Attribute att : attributes){
+ if (att.isPersistent() ? newAttributeList.add(attribute2PersistentAttribute(att)) : newAttributeList.add(attribute2TransientAttribute(att)));
+ }
+ this.attributes = newAttributeList;
+ }
}
\ No newline at end of file
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -0,0 +1,22 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.persistence.Embeddable;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import de.campussource.cse.cdmm.Constants;
+
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
+@Embeddable
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+public class PersistentAttribute extends Attribute {
+
+ public PersistentAttribute(){}
+
+ public PersistentAttribute(String name, String value){
+ setName(name);
+ setValue(value);
+ setPersistent(true);
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -0,0 +1,20 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.persistence.Embeddable;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import de.campussource.cse.cdmm.Constants;
+
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
+@Embeddable
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+public class TransientAttribute extends Attribute {
+ public TransientAttribute(){}
+
+ public TransientAttribute(String name, String value){
+ setName(name);
+ setValue(value);
+ setPersistent(false);
+ }
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-06 10:11:09 UTC (rev 61)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-06 13:29:28 UTC (rev 62)
@@ -21,14 +21,17 @@
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+import de.campussource.cse.cdmm.domain.Attribute;
import de.campussource.cse.cdmm.domain.Account;
import de.campussource.cse.cdmm.domain.Category;
import de.campussource.cse.cdmm.domain.Course;
import de.campussource.cse.cdmm.domain.Entity;
import de.campussource.cse.cdmm.domain.EntityContainer;
import de.campussource.cse.cdmm.domain.Group;
+import de.campussource.cse.cdmm.domain.PersistentAttribute;
import de.campussource.cse.cdmm.domain.Role;
import de.campussource.cse.cdmm.domain.RoleType;
+import de.campussource.cse.cdmm.domain.TransientAttribute;
import junit.framework.TestCase;
@@ -416,35 +419,28 @@
return container;
}
-
- private class Test123{
- public String name;
- public long value;
- }
@Test
- public void testEntityXml(){
- System.out.println("----- entering Entity XML Test -----");
- //create entity object
- Entity entity = new Entity(createUniqueId());
- String testString = "Dies ist ein TestString";
+ public void testAttributeXml(){
+ System.out.println("----- entering Attribute XML Test -----");
+ //create category object with two attributes
+ Category category = new Category(createUniqueId());
+ TransientAttribute att1 = new TransientAttribute();
+ att1.setName("TNAME");
+ att1.setValue("TVALUE");
+ PersistentAttribute att2 = new PersistentAttribute();
+ att2.setName("PNAME");
+ att2.setValue("PVALUE");
+ List<Attribute> attributes = new ArrayList<Attribute>();
+ attributes.add(att1);
+ attributes.add(att2);
+ category.setAttributes(attributes);
-// Test123 testClass = new Test123();
-// testClass.name="TestName";
-// testClass.value=1L;
-//
-// List<Object> objects = new ArrayList<Object>();
-// objects.add(testString); objects.add(testClass);
-//
-// entity.setAny(objects);
-//
-// assertNotNull(entity);
-
//create jaxb context and marshaller
Marshaller marshaller=null;
JAXBContext context=null;
try {
- context = JAXBContext.newInstance(Entity.class);
+ context = JAXBContext.newInstance(Category.class);
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
} catch (JAXBException e) {
@@ -456,7 +452,7 @@
String outputXml = "";
try {
Writer writer = new StringWriter();
- marshaller.marshal(entity, writer);
+ marshaller.marshal(category, writer);
outputXml = writer.toString();
writer.close();
} catch (JAXBException e) {
@@ -467,23 +463,18 @@
assertTrue((outputXml!=null)&&(outputXml!=""));
System.out.println(outputXml);
- outputXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
- "<ns2:entity xmlns:ns2=\"http://cse.campussource.de/DataTypes\">" +
- "<id>1236268822040</id>" +
- "<test>124356</test>" +
- "</ns2:entity>";
-
//convert xml back to an object and assert equality to source object
- Entity convertedEntity=null;
+ Category convertedCategory=null;
try {
Unmarshaller unmarshaller = context.createUnmarshaller();
- convertedEntity = (Entity) unmarshaller.unmarshal(new StringReader(outputXml));
- System.out.println(convertedEntity.toString());
+ convertedCategory = (Category) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedCategory.toString());
} catch (JAXBException e) {
fail(e.getMessage());
}
- assertFalse(entity.equals(convertedEntity));
- System.out.println("----- leaving Entity XML Test -----");
- }
+ assertTrue(category.equals(convertedCategory));
+ System.out.println("----- leaving Attribute XML Test -----");
+
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-06 10:11:12
|
Revision: 61
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=61&view=rev
Author: roekens
Date: 2009-03-06 10:11:09 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
added documentation folder containing current canonical data model
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/documentation/
cse-ip/trunk/sandbox/cse-ip/documentation/cdmm.mdzip
Added: cse-ip/trunk/sandbox/cse-ip/documentation/cdmm.mdzip
===================================================================
(Binary files differ)
Property changes on: cse-ip/trunk/sandbox/cse-ip/documentation/cdmm.mdzip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 16:15:38
|
Revision: 60
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=60&view=rev
Author: roekens
Date: 2009-03-05 16:15:28 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
testing with any elements
Modified Paths:
--------------
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/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-05 15:49:09 UTC (rev 59)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 16:15:28 UTC (rev 60)
@@ -24,6 +24,7 @@
import de.campussource.cse.cdmm.domain.Account;
import de.campussource.cse.cdmm.domain.Category;
import de.campussource.cse.cdmm.domain.Course;
+import de.campussource.cse.cdmm.domain.Entity;
import de.campussource.cse.cdmm.domain.EntityContainer;
import de.campussource.cse.cdmm.domain.Group;
import de.campussource.cse.cdmm.domain.Role;
@@ -416,4 +417,73 @@
return container;
}
+ private class Test123{
+ public String name;
+ public long value;
+ }
+
+ @Test
+ public void testEntityXml(){
+ System.out.println("----- entering Entity XML Test -----");
+ //create entity object
+ Entity entity = new Entity(createUniqueId());
+ String testString = "Dies ist ein TestString";
+
+// Test123 testClass = new Test123();
+// testClass.name="TestName";
+// testClass.value=1L;
+//
+// List<Object> objects = new ArrayList<Object>();
+// objects.add(testString); objects.add(testClass);
+//
+// entity.setAny(objects);
+//
+// assertNotNull(entity);
+
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
+ try {
+ context = JAXBContext.newInstance(Entity.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ //convert group object to xml
+ String outputXml = "";
+ try {
+ Writer writer = new StringWriter();
+ marshaller.marshal(entity, writer);
+ outputXml = writer.toString();
+ writer.close();
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
+ System.out.println(outputXml);
+
+ outputXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
+ "<ns2:entity xmlns:ns2=\"http://cse.campussource.de/DataTypes\">" +
+ "<id>1236268822040</id>" +
+ "<test>124356</test>" +
+ "</ns2:entity>";
+
+ //convert xml back to an object and assert equality to source object
+ Entity convertedEntity=null;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ convertedEntity = (Entity) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedEntity.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ assertFalse(entity.equals(convertedEntity));
+ System.out.println("----- leaving Entity XML Test -----");
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 15:49:19
|
Revision: 59
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=59&view=rev
Author: roekens
Date: 2009-03-05 15:49:09 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
removed unnecessary namespace definitions
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.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/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-05 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -47,8 +47,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name=Constants.ROLES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.ROLE, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.ROLES)
+ @XmlElement(name=Constants.ROLE)
public List<Role> getRoles() {
return roles;
}
@@ -57,8 +57,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name=Constants.GROUPS, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.GROUP, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.GROUPS)
+ @XmlElement(name=Constants.GROUP)
@XmlIDREF
public List<Group> getGroups() {
return groups;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-05 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -52,8 +52,8 @@
}
- @XmlElementWrapper(name=Constants.CATEGORIES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.CATEGORIES)
+ @XmlElement(name=Constants.CATEGORY)
public List<Category> getChildren() {
return children;
}
@@ -62,8 +62,8 @@
this.children = children;
}
- @XmlElementWrapper(name=Constants.COURSES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.COURSE, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.COURSES)
+ @XmlElement(name=Constants.COURSE)
@XmlIDREF
public List<Course> getCourses() {
return courses;
@@ -73,8 +73,8 @@
this.courses = courses;
}
- @XmlElementWrapper(name=Constants.PARENTS, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.PARENT, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.PARENTS)
+ @XmlElement(name=Constants.PARENT)
@XmlIDREF
public List<Category> getParents() {
return parents;
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 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -64,7 +64,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
}
- @XmlElement(name=Constants.PARENT, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.PARENT)
@XmlIDREF
public Course getParent() {
return parent;
@@ -74,8 +74,8 @@
this.parent = parent;
}
- @XmlElementWrapper(name=Constants.WORKGROUPS, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.WORKGROUP, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.WORKGROUPS)
+ @XmlElement(name=Constants.WORKGROUP)
public List<Course> getWorkgroups() {
return workgroups;
}
@@ -84,8 +84,8 @@
this.workgroups = workgroups;
}
- @XmlElementWrapper(name=Constants.CATEGORIES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.CATEGORIES)
+ @XmlElement(name=Constants.CATEGORY)
@XmlIDREF
public List<Category> getCategories() {
return categories;
@@ -95,8 +95,8 @@
this.categories = categories;
}
- @XmlElementWrapper(name=Constants.ROLES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.ROLE, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.ROLES)
+ @XmlElement(name=Constants.ROLE)
public List<Role> getRoles() {
return roles;
}
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 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -1,9 +1,12 @@
package de.campussource.cse.cdmm.domain;
+import java.util.List;
+
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
@@ -17,12 +20,14 @@
import de.campussource.cse.cdmm.IdAdapter;
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.ID}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.ID, "any"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
+
+ private List<Object> any;
public Entity(){
}
@@ -63,8 +68,17 @@
@XmlID
@XmlJavaTypeAdapter(value=IdAdapter.class)
- @XmlElement(name=Constants.ID, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.ID)
public Long getId() {
return id;
+ }
+
+ @XmlAnyElement
+ public List<Object> getAny() {
+ return any;
+ }
+
+ public void setAny(List<Object> any) {
+ this.any = any;
};
}
\ No newline at end of file
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-05 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -31,20 +31,20 @@
this.accounts = accounts;
}
- @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.CATEGORY)
public Category getRootCategory() {
return rootCategory;
}
- @XmlElementWrapper(name=Constants.COURSES, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.COURSE, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.COURSES)
+ @XmlElement(name=Constants.COURSE)
public List<Course> getCourses() {
return courses;
}
- @XmlElementWrapper(name=Constants.ACCOUNTS, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElements(value= {@XmlElement(name=Constants.ACCOUNT,type=Account.class, namespace=Constants.NAMESPACE_DATATYPES), @XmlElement(name=Constants.GROUP,type=Group.class, namespace=Constants.NAMESPACE_DATATYPES)})
+ @XmlElementWrapper(name=Constants.ACCOUNTS)
+ @XmlElements(value= {@XmlElement(name=Constants.ACCOUNT,type=Account.class), @XmlElement(name=Constants.GROUP,type=Group.class)})
public List<Account> getAccounts() {
return accounts;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-05 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -69,8 +69,8 @@
this.members = members;
}
- @XmlElementWrapper(name=Constants.MEMBERS, namespace=Constants.NAMESPACE_DATATYPES)
- @XmlElement(name=Constants.MEMBER, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElementWrapper(name=Constants.MEMBERS)
+ @XmlElement(name=Constants.MEMBER)
@XmlIDREF
public List<Account> getMembers() {
return members;
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 15:35:02 UTC (rev 58)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-05 15:49:09 UTC (rev 59)
@@ -51,7 +51,7 @@
setId(id);
}
- @XmlElement(name=Constants.TYPE, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.TYPE)
public RoleType getType() {
return type;
}
@@ -60,7 +60,7 @@
this.type = type;
}
- @XmlElement(name=Constants.ACCOUNT_ID, required=true, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.ACCOUNT_ID, required=true)
@XmlIDREF
public Account getAccount() {
return account;
@@ -70,7 +70,7 @@
this.account = account;
}
- @XmlElement(name=Constants.COURSE_ID, required=true, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.COURSE_ID, required=true)
@XmlIDREF
public Course getCourse() {
return course;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 15:35:11
|
Revision: 58
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=58&view=rev
Author: roekens
Date: 2009-03-05 15:35:02 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
fixed splitted xsd generation:
-> elements and element types have to be in the same namespace, for each must namespace be defined seperately
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.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/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-05 13:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -20,7 +20,7 @@
@Entity
@Embeddable
@Table(name = Constants.TABLENAME_ACCOUNT)
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={ Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Account extends de.campussource.cse.cdmm.domain.Entity{
@@ -47,8 +47,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name=Constants.ROLES)
- @XmlElement(name=Constants.ROLE)
+ @XmlElementWrapper(name=Constants.ROLES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.ROLE, namespace=Constants.NAMESPACE_DATATYPES)
public List<Role> getRoles() {
return roles;
}
@@ -57,8 +57,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name=Constants.GROUPS)
- @XmlElement(name=Constants.GROUP)
+ @XmlElementWrapper(name=Constants.GROUPS, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.GROUP, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public List<Group> getGroups() {
return groups;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-05 13:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -20,7 +20,7 @@
@Entity
@Embeddable
@Table(name = Constants.TABLENAME_CATEGORY)
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.PROPERTY_PARENTS, Constants.PROPERTY_CHILDREN, Constants.PROPERTY_COURSES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Category extends de.campussource.cse.cdmm.domain.Entity {
@@ -52,8 +52,8 @@
}
- @XmlElementWrapper(name=Constants.CATEGORIES)
- @XmlElement(name=Constants.CATEGORY)
+ @XmlElementWrapper(name=Constants.CATEGORIES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
public List<Category> getChildren() {
return children;
}
@@ -62,8 +62,8 @@
this.children = children;
}
- @XmlElementWrapper(name=Constants.COURSES)
- @XmlElement(name=Constants.COURSE)
+ @XmlElementWrapper(name=Constants.COURSES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.COURSE, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public List<Course> getCourses() {
return courses;
@@ -73,8 +73,8 @@
this.courses = courses;
}
- @XmlElementWrapper(name=Constants.PARENTS)
- @XmlElement(name=Constants.PARENT)
+ @XmlElementWrapper(name=Constants.PARENTS, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.PARENT, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public List<Category> getParents() {
return parents;
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:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -24,7 +24,7 @@
@Entity
@Embeddable
@Table(name = Constants.TABLENAME_COURSE)
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Course extends de.campussource.cse.cdmm.domain.Entity{
@@ -64,7 +64,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
}
- @XmlElement(name=Constants.PARENT)
+ @XmlElement(name=Constants.PARENT, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public Course getParent() {
return parent;
@@ -74,8 +74,8 @@
this.parent = parent;
}
- @XmlElementWrapper(name=Constants.WORKGROUPS)
- @XmlElement(name=Constants.WORKGROUP)
+ @XmlElementWrapper(name=Constants.WORKGROUPS, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.WORKGROUP, namespace=Constants.NAMESPACE_DATATYPES)
public List<Course> getWorkgroups() {
return workgroups;
}
@@ -84,8 +84,8 @@
this.workgroups = workgroups;
}
- @XmlElementWrapper(name=Constants.CATEGORIES)
- @XmlElement(name=Constants.CATEGORY)
+ @XmlElementWrapper(name=Constants.CATEGORIES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public List<Category> getCategories() {
return categories;
@@ -95,8 +95,8 @@
this.categories = categories;
}
- @XmlElementWrapper(name=Constants.ROLES)
- @XmlElement(name=Constants.ROLE)
+ @XmlElementWrapper(name=Constants.ROLES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.ROLE, namespace=Constants.NAMESPACE_DATATYPES)
public List<Role> getRoles() {
return roles;
}
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:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -16,7 +16,7 @@
import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.IdAdapter;
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.ID}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@@ -63,7 +63,7 @@
@XmlID
@XmlJavaTypeAdapter(value=IdAdapter.class)
- @XmlElement(name=Constants.ID)
+ @XmlElement(name=Constants.ID, namespace=Constants.NAMESPACE_DATATYPES)
public Long getId() {
return id;
};
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-05 13:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -13,7 +13,7 @@
import de.campussource.cse.cdmm.Constants;
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class EntityContainer{
@@ -31,20 +31,20 @@
this.accounts = accounts;
}
- @XmlElement(name=Constants.CATEGORY)
+ @XmlElement(name=Constants.CATEGORY, namespace=Constants.NAMESPACE_DATATYPES)
public Category getRootCategory() {
return rootCategory;
}
- @XmlElementWrapper(name=Constants.COURSES)
- @XmlElement(name=Constants.COURSE)
+ @XmlElementWrapper(name=Constants.COURSES, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.COURSE, namespace=Constants.NAMESPACE_DATATYPES)
public List<Course> getCourses() {
return courses;
}
- @XmlElementWrapper(name=Constants.ACCOUNTS)
- @XmlElements(value= {@XmlElement(name=Constants.ACCOUNT,type=Account.class), @XmlElement(name=Constants.GROUP,type=Group.class)})
+ @XmlElementWrapper(name=Constants.ACCOUNTS, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElements(value= {@XmlElement(name=Constants.ACCOUNT,type=Account.class, namespace=Constants.NAMESPACE_DATATYPES), @XmlElement(name=Constants.GROUP,type=Group.class, namespace=Constants.NAMESPACE_DATATYPES)})
public List<Account> getAccounts() {
return accounts;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-05 13:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -20,7 +20,7 @@
@Entity
@Embeddable
@Table(name = Constants.TABLENAME_GROUP)
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES)
public class Group extends Account{
@@ -69,8 +69,8 @@
this.members = members;
}
- @XmlElementWrapper(name=Constants.MEMBERS)
- @XmlElement(name=Constants.MEMBER)
+ @XmlElementWrapper(name=Constants.MEMBERS, namespace=Constants.NAMESPACE_DATATYPES)
+ @XmlElement(name=Constants.MEMBER, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public List<Account> getMembers() {
return members;
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:19:06 UTC (rev 57)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-05 15:35:02 UTC (rev 58)
@@ -17,7 +17,7 @@
@Entity
@Embeddable
@Table(name = Constants.TABLENAME_ROLE)
-@XmlRootElement
+@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES)
public class Role extends de.campussource.cse.cdmm.domain.Entity{
@@ -51,7 +51,7 @@
setId(id);
}
- @XmlElement(name=Constants.TYPE)
+ @XmlElement(name=Constants.TYPE, namespace=Constants.NAMESPACE_DATATYPES)
public RoleType getType() {
return type;
}
@@ -60,7 +60,7 @@
this.type = type;
}
- @XmlElement(name=Constants.ACCOUNT_ID, required=true)
+ @XmlElement(name=Constants.ACCOUNT_ID, required=true, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public Account getAccount() {
return account;
@@ -70,7 +70,7 @@
this.account = account;
}
- @XmlElement(name=Constants.COURSE_ID, required=true)
+ @XmlElement(name=Constants.COURSE_ID, required=true, namespace=Constants.NAMESPACE_DATATYPES)
@XmlIDREF
public Course getCourse() {
return course;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 13:19:12
|
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.
|
|
From: <ro...@us...> - 2009-03-05 13:09:52
|
Revision: 56
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=56&view=rev
Author: roekens
Date: 2009-03-05 13:09:43 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
- moved RoleType to domain package and fixed xml namespace
- enhanced test output of xml schemas
Modified Paths:
--------------
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/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
Removed Paths:
-------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java 2009-03-05 12:56:15 UTC (rev 55)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java 2009-03-05 13:09:43 UTC (rev 56)
@@ -1,14 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-@XmlEnum
-public enum RoleType{
- @XmlEnumValue(value="UNDEFINED")
- UNDEFINED,
- @XmlEnumValue(value="PARTICIPANT")
- PARTICIPANT,
- @XmlEnumValue(value="ASSISTANT")
- ASSISTANT
-}
\ No newline at end of file
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 12:56:15 UTC (rev 55)
+++ 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)
@@ -12,7 +12,7 @@
import javax.xml.bind.annotation.XmlType;
import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.RoleType;
+import de.campussource.cse.cdmm.domain.RoleType;
@Entity
@Embeddable
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java 2009-03-05 13:09:43 UTC (rev 56)
@@ -0,0 +1,18 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+import de.campussource.cse.cdmm.Constants;
+
+@XmlEnum
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+public enum RoleType{
+ @XmlEnumValue(value="UNDEFINED")
+ UNDEFINED,
+ @XmlEnumValue(value="PARTICIPANT")
+ PARTICIPANT,
+ @XmlEnumValue(value="ASSISTANT")
+ ASSISTANT
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-05 12:56:15 UTC (rev 55)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 13:09:43 UTC (rev 56)
@@ -27,6 +27,7 @@
import de.campussource.cse.cdmm.domain.EntityContainer;
import de.campussource.cse.cdmm.domain.Group;
import de.campussource.cse.cdmm.domain.Role;
+import de.campussource.cse.cdmm.domain.RoleType;
import junit.framework.TestCase;
@@ -300,7 +301,7 @@
Marshaller marshaller=null;
JAXBContext context=null;
try {
- context = JAXBContext.newInstance(EntityContainer.class);
+ context = JAXBContext.newInstance(new Class[]{EntityContainer.class, Account.class, Group.class, Role.class, Course.class, Category.class});
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
} catch (JAXBException e) {
@@ -321,7 +322,10 @@
return result;
}
});
- printDOMResult(results.get(0));
+ for (DOMResult result : results){
+ System.out.println("----- Generated XML Schema: ");
+ printDOMResult(result);
+ }
} catch (IOException e) {
e.printStackTrace();
fail(e.getMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 12:56:18
|
Revision: 55
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=55&view=rev
Author: roekens
Date: 2009-03-05 12:56:15 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
added test for defined xml schema
TO FIX: output schema contains import of "schema2.xsd" probably due to incorrect annotations
Modified Paths:
--------------
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/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-05 12:51:57 UTC (rev 54)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 12:56:15 UTC (rev 55)
@@ -294,24 +294,42 @@
System.out.println("----- leaving Group XML Test -----");
}
-// final List<DOMResult> results = new ArrayList<DOMResult>();
-// try {
-// context.generateSchema(
-// new SchemaOutputResolver() {
-// @Override
-// public Result createOutput(String ns, String file) throws IOException {
-// DOMResult result = new DOMResult();
-// result.setSystemId(file);
-// results.add(result);
-// return result;
-// }
-// });
-// printDOMResult(results.get(0));
-// } catch (IOException e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
+ @Test
+ public void testXmlSchema(){
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
+ try {
+ context = JAXBContext.newInstance(EntityContainer.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ //create schema
+ final List<DOMResult> results = new ArrayList<DOMResult>();
+ try {
+ context.generateSchema(
+ new SchemaOutputResolver() {
+ @Override
+ public Result createOutput(String ns, String file) throws IOException {
+ DOMResult result = new DOMResult();
+ result.setSystemId(file);
+ results.add(result);
+ return result;
+ }
+ });
+ printDOMResult(results.get(0));
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ }
+
private void printDOMResult(DOMResult domResult) throws IOException{
Document doc = (Document) domResult.getNode();
OutputFormat format = new OutputFormat(doc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 12:52:01
|
Revision: 54
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=54&view=rev
Author: roekens
Date: 2009-03-05 12:51:57 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
fixed comments
Modified Paths:
--------------
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/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-05 12:49:39 UTC (rev 53)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 12:51:57 UTC (rev 54)
@@ -116,7 +116,7 @@
fail(e.getMessage());
}
- //convert account object to xml
+ //convert category object to xml
String outputXml = "";
try {
Writer writer = new StringWriter();
@@ -147,7 +147,7 @@
@Test
public void testCourseXml(){
System.out.println("----- entering Course XML Test -----");
- //create and fetch category object
+ //create and fetch course object
EntityContainer container = generateTestStructure();
Course course = container.getCourses().get(0);
assertNotNull(course);
@@ -164,7 +164,7 @@
fail(e.getMessage());
}
- //convert account object to xml
+ //convert course object to xml
String outputXml = "";
try {
Writer writer = new StringWriter();
@@ -196,7 +196,7 @@
@Test
public void testRoleXml(){
System.out.println("----- entering Role XML Test -----");
- //create and fetch category object
+ //create and fetch role object
EntityContainer container = generateTestStructure();
Role role = container.getAccounts().get(0).getRoles().get(0);
assertNotNull(role);
@@ -213,7 +213,7 @@
fail(e.getMessage());
}
- //convert account object to xml
+ //convert role object to xml
String outputXml = "";
try {
Writer writer = new StringWriter();
@@ -244,7 +244,7 @@
@Test
public void testGroupXml(){
System.out.println("----- entering Group XML Test -----");
- //create and fetch category object
+ //create and fetch group object
EntityContainer container = generateTestStructure();
Group group = null;
for (Account account : container.getAccounts()){
@@ -266,7 +266,7 @@
fail(e.getMessage());
}
- //convert account object to xml
+ //convert group object to xml
String outputXml = "";
try {
Writer writer = new StringWriter();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 12:49:42
|
Revision: 53
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=53&view=rev
Author: roekens
Date: 2009-03-05 12:49:39 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
test for all entities written and success for xml conversion and conversion back to java objects
Modified Paths:
--------------
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/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-05 12:34:42 UTC (rev 52)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 12:49:39 UTC (rev 53)
@@ -144,6 +144,156 @@
System.out.println("----- leaving Category XML Test -----");
}
+ @Test
+ public void testCourseXml(){
+ System.out.println("----- entering Course XML Test -----");
+ //create and fetch category object
+ EntityContainer container = generateTestStructure();
+ Course course = container.getCourses().get(0);
+ assertNotNull(course);
+
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
+ try {
+ context = JAXBContext.newInstance(Course.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ //convert account object to xml
+ String outputXml = "";
+ try {
+ Writer writer = new StringWriter();
+ marshaller.marshal(course, writer);
+ outputXml = writer.toString();
+ writer.close();
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
+ System.out.println(outputXml);
+
+ //convert xml back to an object and assert equality to source object
+ Course convertedCourse=null;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ convertedCourse = (Course) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedCourse.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ assertTrue(course.equals(convertedCourse));
+ System.out.println("----- leaving Course XML Test -----");
+ }
+
+
+ @Test
+ public void testRoleXml(){
+ System.out.println("----- entering Role XML Test -----");
+ //create and fetch category object
+ EntityContainer container = generateTestStructure();
+ Role role = container.getAccounts().get(0).getRoles().get(0);
+ assertNotNull(role);
+
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
+ try {
+ context = JAXBContext.newInstance(Role.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ //convert account object to xml
+ String outputXml = "";
+ try {
+ Writer writer = new StringWriter();
+ marshaller.marshal(role, writer);
+ outputXml = writer.toString();
+ writer.close();
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
+ System.out.println(outputXml);
+
+ //convert xml back to an object and assert equality to source object
+ Role convertedRole=null;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ convertedRole = (Role) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedRole.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ assertTrue(role.equals(convertedRole));
+ System.out.println("----- leaving Role XML Test -----");
+ }
+
+ @Test
+ public void testGroupXml(){
+ System.out.println("----- entering Group XML Test -----");
+ //create and fetch category object
+ EntityContainer container = generateTestStructure();
+ Group group = null;
+ for (Account account : container.getAccounts()){
+ if (account instanceof Group){
+ group = (Group) account;
+ }
+ }
+ assertNotNull(group);
+
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
+ try {
+ context = JAXBContext.newInstance(Group.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ //convert account object to xml
+ String outputXml = "";
+ try {
+ Writer writer = new StringWriter();
+ marshaller.marshal(group, writer);
+ outputXml = writer.toString();
+ writer.close();
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
+ System.out.println(outputXml);
+
+ //convert xml back to an object and assert equality to source object
+ Group convertedGroup=null;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ convertedGroup = (Group) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedGroup.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ assertTrue(group.equals(convertedGroup));
+ System.out.println("----- leaving Group XML Test -----");
+ }
+
// final List<DOMResult> results = new ArrayList<DOMResult>();
// try {
// context.generateSchema(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-05 12:34:45
|
Revision: 52
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=52&view=rev
Author: roekens
Date: 2009-03-05 12:34:42 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
- adding of several testing methods for each domain object
- code polishing: introduced constants class and removed string definitions from entity classes
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
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/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -1,5 +1,60 @@
package de.campussource.cse.cdmm;
public class Constants{
+ //namespace
public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes";
+
+ //xml structure elements
+ public static final String COURSE = "course";
+ public static final String COURSES = "courses";
+ public static final String CATEGORY = "category";
+ public static final String CATEGORIES = "categories";
+ public static final String WORKGROUP = "workgroup";
+ public static final String WORKGROUPS = "workgroups";
+ public static final String ROLE = "role";
+ public static final String ROLES = "roles";
+ public static final String ACCOUNT = "account";
+ public static final String ACCOUNTS = "accounts";
+ public static final String GROUP = "group";
+ public static final String GROUPS = "groups";
+ public static final String PARENT = "parent";
+ public static final String PARENTS = "parents";
+ public static final String MEMBERS = "members";
+ public static final String TYPE = "type";
+
+ //entity ids
+ public static final String COURSE_ID = "courseId";
+ public static final String CATEGORY_ID = "categoryId";
+ public static final String ROLE_ID = "roleId";
+ public static final String ACCOUNT_ID = "accountId";
+ public static final String GROUP_ID = "groupId";
+ public static final String MEMBER = "member";
+
+ //entity property names
+ public static final String PROPERTY_PARENTS = "parents";
+ public static final String PROPERTY_CHILDREN = "children";
+ public static final String PROPERTY_COURSES = "courses";
+
+ //table names
+ public static final String TABLENAME_ACCOUNT = "CDMM_ACCOUNT";
+ public static final String TABLENAME_CATEGORY = "CDMM_CATEGORY";
+ public static final String TABLENAME_COURSE = "CDMM_COURSE";
+ public static final String TABLENAME_ENTITY = "CDMM_ENTITY";
+ public static final String TABLENAME_GROUP = "CDMM_GROUP";
+ public static final String TABLENAME_ROLE = "CDMM_ROLE";
+ public static final String TABLENAME_CATEGORY2CATEGORY = "CDMM_CAT2CAT";
+ public static final String TABLENAME_GROUP2ACCOUNT = "CDMM_GROUP2ACCOUNT";
+ public static final String TABLENAME_COURSE2CATEGORY = "CDMM_COURSE2CAT";
+
+ //column names
+ public static final String COLUMNNAME_ROLE_TYPE="ROLE_TYPE";
+ public static final String COLUMNNAME_CHILD_ID="CHILD_ID";
+ public static final String COLUMNNAME_PARENT_ID="PARENT_ID";
+ public static final String COLUMNNAME_GROUP_ID="GROUP_ID";
+ public static final String COLUMNNAME_ACCOUNT_ID = "ACCOUNT_ID";
+ public static final String COLUMNNAME_CATEGORY_ID = "CATEGORY_ID";
+ public static final String COLUMNNAME_COURSE_ID = "COURSE_ID";
+
+ public static final String ID = "id";
+
}
\ No newline at end of file
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 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -19,19 +19,19 @@
@Entity
@Embeddable
-@Table(name = "CDMM_ACCOUNT")
+@Table(name = Constants.TABLENAME_ACCOUNT)
@XmlRootElement
-@XmlType(propOrder={ "groups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={ Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Account extends de.campussource.cse.cdmm.domain.Entity{
- @OneToMany(mappedBy="account")
+ @OneToMany(mappedBy=Constants.ACCOUNT)
private List<Role> roles;
@ManyToMany
@JoinTable(
- name = "CDMM_GROUP2ACCOUNT",
- joinColumns={@JoinColumn(name="GROUP_ID")},
- inverseJoinColumns={@JoinColumn(name="ACCOUNT_ID")})
+ name = Constants.TABLENAME_GROUP2ACCOUNT,
+ joinColumns={@JoinColumn(name=Constants.COLUMNNAME_GROUP_ID)},
+ inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_GROUP_ID)})
private List<Group> groups;
public Account(){
@@ -47,8 +47,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name="roles")
- @XmlElement(name="role")
+ @XmlElementWrapper(name=Constants.ROLES)
+ @XmlElement(name=Constants.ROLE)
public List<Role> getRoles() {
return roles;
}
@@ -57,8 +57,8 @@
this.roles = roles;
}
- @XmlElementWrapper(name="groups")
- @XmlElement(name="group")
+ @XmlElementWrapper(name=Constants.GROUPS)
+ @XmlElement(name=Constants.GROUP)
@XmlIDREF
public List<Group> getGroups() {
return groups;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -19,22 +19,22 @@
@Entity
@Embeddable
-@Table(name = "CDMM_CATEGORY")
+@Table(name = Constants.TABLENAME_CATEGORY)
@XmlRootElement
-@XmlType(propOrder={ "parents", "children", "courses"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.PROPERTY_PARENTS, Constants.PROPERTY_CHILDREN, Constants.PROPERTY_COURSES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Category extends de.campussource.cse.cdmm.domain.Entity {
@ManyToMany
@JoinTable(
- name = "CDMM_CAT2CAT",
- joinColumns={@JoinColumn(name="CHILD_ID")},
- inverseJoinColumns={@JoinColumn(name="PARENT_ID")})
+ name = Constants.TABLENAME_CATEGORY2CATEGORY,
+ joinColumns={@JoinColumn(name=Constants.COLUMNNAME_CHILD_ID)},
+ inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_PARENT_ID)})
private List<Category> parents;
- @ManyToMany(mappedBy="parent")
+ @ManyToMany(mappedBy=Constants.PARENT)
private List<Category> children;
- @ManyToMany(mappedBy="categories")
+ @ManyToMany(mappedBy=Constants.CATEGORIES)
private List<Course> courses;
public Category() {
@@ -52,8 +52,8 @@
}
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category")
+ @XmlElementWrapper(name=Constants.CATEGORIES)
+ @XmlElement(name=Constants.CATEGORY)
public List<Category> getChildren() {
return children;
}
@@ -62,8 +62,8 @@
this.children = children;
}
- @XmlElementWrapper(name="courses")
- @XmlElement(name="course")
+ @XmlElementWrapper(name=Constants.COURSES)
+ @XmlElement(name=Constants.COURSE)
@XmlIDREF
public List<Course> getCourses() {
return courses;
@@ -73,8 +73,8 @@
this.courses = courses;
}
- @XmlElementWrapper(name="parents")
- @XmlElement(name="parent")
+ @XmlElementWrapper(name=Constants.PARENTS)
+ @XmlElement(name=Constants.PARENT)
@XmlIDREF
public List<Category> getParents() {
return parents;
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-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -23,26 +23,26 @@
@Entity
@Embeddable
-@Table(name = "CDMM_COURSE")
+@Table(name = Constants.TABLENAME_COURSE)
@XmlRootElement
-@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Course extends de.campussource.cse.cdmm.domain.Entity{
@ManyToOne
- @JoinTable(name="PARENT_ID")
+ @JoinTable(name=Constants.COLUMNNAME_PARENT_ID)
private Course parent;
- @OneToMany(mappedBy="parent")
+ @OneToMany(mappedBy=Constants.PARENT)
private List<Course> workgroups;
@ManyToMany
@JoinTable(
- name = "CDMM_COURSE2CAT",
- joinColumns={@JoinColumn(name="CATEGORY_ID")},
- inverseJoinColumns={@JoinColumn(name="COURSE_ID")})
+ name = Constants.TABLENAME_COURSE2CATEGORY,
+ joinColumns={@JoinColumn(name=Constants.COLUMNNAME_CATEGORY_ID)},
+ inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_COURSE_ID)})
private List<Category> categories;
- @OneToMany(mappedBy="course")
+ @OneToMany(mappedBy=Constants.COURSE)
private List<Role> roles;
public Course(){
@@ -64,7 +64,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
}
- @XmlElement
+ @XmlElement(name=Constants.PARENT)
@XmlIDREF
public Course getParent() {
return parent;
@@ -74,8 +74,8 @@
this.parent = parent;
}
- @XmlElementWrapper(name="workgroups")
- @XmlElement(name="workgroup")
+ @XmlElementWrapper(name=Constants.WORKGROUPS)
+ @XmlElement(name=Constants.WORKGROUP)
public List<Course> getWorkgroups() {
return workgroups;
}
@@ -84,8 +84,8 @@
this.workgroups = workgroups;
}
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category", required=true)
+ @XmlElementWrapper(name=Constants.CATEGORIES)
+ @XmlElement(name=Constants.CATEGORY, required=true)
@XmlIDREF
public List<Category> getCategories() {
return categories;
@@ -95,8 +95,8 @@
this.categories = categories;
}
- @XmlElementWrapper(name="roles")
- @XmlElement(name="role")
+ @XmlElementWrapper(name=Constants.ROLES)
+ @XmlElement(name=Constants.ROLE)
public List<Role> getRoles() {
return roles;
}
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-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -17,7 +17,7 @@
import de.campussource.cse.cdmm.IdAdapter;
@XmlRootElement
-@XmlType(propOrder={"id"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.ID}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@Id
@@ -63,7 +63,7 @@
@XmlID
@XmlJavaTypeAdapter(value=IdAdapter.class)
- @XmlAttribute(name="id")
+ @XmlAttribute(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/EntityContainer.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -31,20 +31,20 @@
this.accounts = accounts;
}
- @XmlElement(name="category")
+ @XmlElement(name=Constants.CATEGORY)
public Category getRootCategory() {
return rootCategory;
}
- @XmlElementWrapper(name="courses")
- @XmlElement(name="course")
+ @XmlElementWrapper(name=Constants.COURSES)
+ @XmlElement(name=Constants.COURSE)
public List<Course> getCourses() {
return courses;
}
- @XmlElementWrapper(name="accounts")
- @XmlElements(value= {@XmlElement(name="account",type=Account.class), @XmlElement(name="group",type=Group.class)})
+ @XmlElementWrapper(name=Constants.ACCOUNTS)
+ @XmlElements(value= {@XmlElement(name=Constants.ACCOUNT,type=Account.class), @XmlElement(name=Constants.GROUP,type=Group.class)})
public List<Account> getAccounts() {
return accounts;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -19,12 +19,12 @@
@Entity
@Embeddable
-@Table(name = "CDMM_GROUP")
+@Table(name = Constants.TABLENAME_GROUP)
@XmlRootElement
-@XmlType(propOrder={"members"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES)
public class Group extends Account{
- @ManyToMany(mappedBy="groups")
+ @ManyToMany(mappedBy=Constants.GROUPS)
private List<Account> members;
public Group(){
@@ -69,8 +69,8 @@
this.members = members;
}
- @XmlElementWrapper(name="members")
- @XmlElement(name="member")
+ @XmlElementWrapper(name=Constants.MEMBERS)
+ @XmlElement(name=Constants.MEMBER)
@XmlIDREF
public List<Account> getMembers() {
return members;
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-04 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -16,20 +16,20 @@
@Entity
@Embeddable
-@Table(name = "CDMM_ROLE")
+@Table(name = Constants.TABLENAME_ROLE)
@XmlRootElement
-@XmlType(propOrder={"type", "account", "course"}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES)
public class Role extends de.campussource.cse.cdmm.domain.Entity{
- @Column(name="ROLE_TYPE")
+ @Column(name=Constants.COLUMNNAME_ROLE_TYPE)
private RoleType type;
@ManyToOne
- @JoinColumn(name="ACCOUNT_ID")
+ @JoinColumn(name=Constants.COLUMNNAME_ACCOUNT_ID)
private Account account;
@ManyToOne
- @JoinColumn(name="COURSE_ID")
+ @JoinColumn(name=Constants.COLUMNNAME_COURSE_ID)
private Course course;
public Role(){
@@ -60,7 +60,7 @@
this.type = type;
}
- @XmlElement(name="accountId", required=true)
+ @XmlElement(name=Constants.ACCOUNT_ID, required=true)
@XmlIDREF
public Account getAccount() {
return account;
@@ -70,7 +70,7 @@
this.account = account;
}
- @XmlElement(name="courseId", required=true)
+ @XmlElement(name=Constants.COURSE_ID, required=true)
@XmlIDREF
public Course getCourse() {
return course;
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 14:09:18 UTC (rev 51)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-05 12:34:42 UTC (rev 52)
@@ -42,11 +42,25 @@
}
@Test
- public void testConversionSimple(){
+ public void testAccountXml(){
+ System.out.println("----- entering Account XML Test -----");
+ //create and fetch account object
+ EntityContainer container = generateTestStructure();
+ Account account = null;
+ for (Account acc : container.getAccounts()){
+ if (acc instanceof Account && !(acc instanceof Group)){
+ account = acc;
+ }
+ }
+ if (account == null){
+ fail("no account object created");
+ }
+
+ //create jaxb context and marshaller
Marshaller marshaller=null;
JAXBContext context=null;
try {
- context = JAXBContext.newInstance(EntityContainer.class);
+ context = JAXBContext.newInstance(Account.class);
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
} catch (JAXBException e) {
@@ -54,52 +68,100 @@
fail(e.getMessage());
}
- EntityContainer container = generateTestStructure();
-
-
+ //convert account object to xml
String outputXml = "";
try {
Writer writer = new StringWriter();
- marshaller.marshal(container, writer);
+ marshaller.marshal(account, writer);
outputXml = writer.toString();
writer.close();
} catch (JAXBException e) {
fail(e.getMessage());
} catch (IOException e) {
fail(e.getMessage());
- }
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
System.out.println(outputXml);
+ //convert xml back to an object and assert equality to source object
+ Account convertedAccount=null;
try {
Unmarshaller unmarshaller = context.createUnmarshaller();
- EntityContainer ec = (EntityContainer) unmarshaller.unmarshal(new StringReader(outputXml));
- System.out.println(ec.toString());
+ convertedAccount = (Account) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedAccount.toString());
} catch (JAXBException e) {
fail(e.getMessage());
}
+ assertTrue(account.equals(convertedAccount));
+ System.out.println("----- leaving Account XML Test -----");
+ }
+
+ @Test
+ public void testCategoryXml(){
+ System.out.println("----- entering Category XML Test -----");
+ //create and fetch category object
+ EntityContainer container = generateTestStructure();
+ Category category = container.getRootCategory();
+ assertNotNull(category);
- final List<DOMResult> results = new ArrayList<DOMResult>();
+ //create jaxb context and marshaller
+ Marshaller marshaller=null;
+ JAXBContext context=null;
try {
- context.generateSchema(
- new SchemaOutputResolver() {
- @Override
- public Result createOutput(String ns, String file) throws IOException {
- DOMResult result = new DOMResult();
- result.setSystemId(file);
- results.add(result);
- return result;
- }
- });
- printDOMResult(results.get(0));
- } catch (IOException e) {
+ context = JAXBContext.newInstance(Category.class);
+ marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ } catch (JAXBException e) {
e.printStackTrace();
fail(e.getMessage());
}
+ //convert account object to xml
+ String outputXml = "";
+ try {
+ Writer writer = new StringWriter();
+ marshaller.marshal(category, writer);
+ outputXml = writer.toString();
+ writer.close();
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ assertTrue((outputXml!=null)&&(outputXml!=""));
+ System.out.println(outputXml);
-
- }
+ //convert xml back to an object and assert equality to source object
+ Category convertedCategory=null;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ convertedCategory = (Category) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(convertedCategory.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ assertTrue(category.equals(convertedCategory));
+ System.out.println("----- leaving Category XML Test -----");
+ }
+// final List<DOMResult> results = new ArrayList<DOMResult>();
+// try {
+// context.generateSchema(
+// new SchemaOutputResolver() {
+// @Override
+// public Result createOutput(String ns, String file) throws IOException {
+// DOMResult result = new DOMResult();
+// result.setSystemId(file);
+// results.add(result);
+// return result;
+// }
+// });
+// printDOMResult(results.get(0));
+// } catch (IOException e) {
+// e.printStackTrace();
+// fail(e.getMessage());
+// }
+
private void printDOMResult(DOMResult domResult) throws IOException{
Document doc = (Document) domResult.getNode();
OutputFormat format = new OutputFormat(doc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 14:09:21
|
Revision: 51
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=51&view=rev
Author: roekens
Date: 2009-03-04 14:09:18 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
- moved jaxb annotations from attributes to getters in EntityContainer class to prevent unnecessary use of @XmlTransient
- added constructors (for creating of objects with set id)
- fix for xml structure, accounts and groups are bundled and categories are defined in hierarchy
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
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/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 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -37,6 +37,10 @@
public Account(){
}
+ public Account(Long id){
+ setId(id);
+ }
+
public Account(Long id, List<Group> groups, List<Role> roles){
setId(id);
this.groups = groups;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -40,6 +40,10 @@
public Category() {
}
+ public Category(Long id){
+ setId(id);
+ }
+
public Category(Long id, List<Category> children, List<Course> courses, List<Category> parents){
setId(id);
this.children = children;
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-04 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -48,6 +48,10 @@
public Course(){
}
+ public Course(Long id){
+ setId(id);
+ }
+
public Course(Long id, List<Category> categories, Course parent, List<Role> roles, List<Course> workgroups){
setId(id);
this.categories = categories;
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 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -6,7 +6,6 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -18,34 +17,12 @@
@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class EntityContainer{
- @XmlElementWrapper(name="entities")
- @XmlElement(name="entity")
- private List<Entity> entities;
+ private Category rootCategory;
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category")
- private List<Category> categories;
-
- @XmlElementWrapper(name="courses")
- @XmlElement(name="course")
private List<Course> courses;
- @XmlElementWrapper(name="accounts")
- @XmlElements(value= {@XmlElement(name="account",type=Account.class),@XmlElement(name="group",type=Group.class)})
private List<Account> accounts;
- @XmlElementWrapper(name="groups")
- @XmlElement(name="group")
- private List<Group> groups;
-
- public void setEntities(List<Entity> entities) {
- this.entities = entities;
- }
-
- public void setCategories(List<Category> categories) {
- this.categories = categories;
- }
-
public void setCourses(List<Course> courses) {
this.courses = courses;
}
@@ -54,40 +31,32 @@
this.accounts = accounts;
}
- public void setGroups(List<Group> groups) {
- this.groups = groups;
+ @XmlElement(name="category")
+ public Category getRootCategory() {
+ return rootCategory;
}
- @XmlTransient
- public List<Entity> getEntities() {
- return entities;
- }
-
- @XmlTransient
- public List<Category> getCategories() {
- return categories;
- }
-
- @XmlTransient
+ @XmlElementWrapper(name="courses")
+ @XmlElement(name="course")
public List<Course> getCourses() {
return courses;
}
- @XmlTransient
+ @XmlElementWrapper(name="accounts")
+ @XmlElements(value= {@XmlElement(name="account",type=Account.class), @XmlElement(name="group",type=Group.class)})
public List<Account> getAccounts() {
return accounts;
}
- @XmlTransient
- public List<Group> getGroups() {
- return groups;
- }
-
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE).append(categories.toArray()).append(courses.toArray()).append(accounts.toArray()).append(groups.toArray()).toString();
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE).append(rootCategory).append(courses.toArray()).append(accounts.toArray()).toString();
}
+
+ public void setRootCategory(Category rootCategory) {
+ this.rootCategory = rootCategory;
+ }
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -30,6 +30,10 @@
public Group(){
}
+ public Group(Long id){
+ setId(id);
+ }
+
public Group(Long id, List<Account> members){
setId(id);
this.members = members;
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-04 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -42,6 +42,15 @@
this.course = course;
}
+ public Role(Long id, RoleType type){
+ setId(id);
+ this.type = type;
+ }
+
+ public Role(Long id) {
+ setId(id);
+ }
+
@XmlElement
public RoleType getType() {
return type;
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 12:48:28 UTC (rev 50)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-04 14:09:18 UTC (rev 51)
@@ -15,6 +15,7 @@
import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
+import org.junit.Test;
import org.w3c.dom.Document;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
@@ -40,6 +41,7 @@
return currentTimeMillis++;
}
+ @Test
public void testConversionSimple(){
Marshaller marshaller=null;
JAXBContext context=null;
@@ -107,41 +109,53 @@
}
private EntityContainer generateTestStructure() {
- Category categoryA = new Category();
- categoryA.setId(createUniqueId());
+ //create small category structure: parentCategory -> childCategory
+ Category parentCategory = new Category(createUniqueId());
+ Category childCategory = new Category(createUniqueId());
+
+ List<Category> parentCategoryList = new ArrayList<Category>();
+ parentCategoryList.add(parentCategory);
- Category categoryB = new Category();
- categoryB.setId(createUniqueId());
- List<Category> parentCategory = new ArrayList<Category>();
- parentCategory.add(categoryA);
- List<Category> childCategory = new ArrayList<Category>();
- childCategory.add(categoryB);
- categoryB.setParents(parentCategory);
- categoryA.setChildren(childCategory);
+ List<Category> childCategoryList = new ArrayList<Category>();
+ childCategoryList.add(childCategory);
- Course course = new Course();
- course.setId(createUniqueId());
- course.setCategories(parentCategory);
-
- List<Course> cl = new ArrayList<Course>(); cl.add(course);
- categoryA.setCourses(cl);
+ parentCategory.setChildren(childCategoryList);
+ childCategory.setParents(parentCategoryList);
- Account account = new Account();
- account.setId(createUniqueId());
+
+ //create Course with one child workgroup
+ Course course = new Course(createUniqueId());
+ course.setCategories(parentCategoryList);
+
+ Course workgroup = new Course(createUniqueId());
+ workgroup.setParent(course);
+ workgroup.setRoles(null);
+ List<Course> workgroups = new ArrayList<Course>();
+ workgroups.add(workgroup);
+
+ course.setWorkgroups(workgroups);
+
+ //add course to parent Category
+ List<Course> courses = new ArrayList<Course>();
+ courses.add(course);
+
+ parentCategory.setCourses(courses);
+
+ //create account and a group and put account to group
+ Account account = new Account(createUniqueId());
List<Account> accounts= new ArrayList<Account>();
accounts.add(account);
- Group group = new Group();
- group.setId(createUniqueId());
+ Group group = new Group(createUniqueId());
+ group.setMembers(accounts);
List<Group> groups = new ArrayList<Group>();
groups.add(group);
account.setGroups(groups);
- group.setMembers(accounts);
-
- Role role = new Role();
- role.setId(createUniqueId());
+
+ //define role between account and course
+ Role role = new Role(createUniqueId());
role.setAccount(account);
role.setCourse(course);
role.setType(RoleType.ASSISTANT);
@@ -151,23 +165,20 @@
account.setRoles(roles);
course.setRoles(roles);
+ // put all created objects into entitycontainer
+
EntityContainer container = new EntityContainer();
List<Account> accs = new ArrayList<Account>();
- accs.add(account);
+ accs.add(account);
+ accs.add(group);
container.setAccounts(accs);
- List<Category> cats = new ArrayList<Category>();
- cats.add(categoryA);
- container.setCategories(cats);
+ container.setRootCategory(parentCategory);
List<Course> cous = new ArrayList<Course>();
cous.add(course);
container.setCourses(cous);
- List<Group> grps = new ArrayList<Group>();
- grps.add(group);
- container.setGroups(grps);
-
return container;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 12:48:32
|
Revision: 50
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=50&view=rev
Author: roekens
Date: 2009-03-04 12:48:28 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
- removed attributes definition <- attributes are getting realized in a different way
- introduced constants class to prevent repetetive string definitions in java classes
- introduced namespaces for xml
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
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/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
Removed Paths:
-------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -0,0 +1,5 @@
+package de.campussource.cse.cdmm;
+
+public class Constants{
+ public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes";
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,7 +0,0 @@
-package de.campussource.cse.cdmm.dao;
-import de.campussource.cse.cdmm.dao.DAOJPA;
-import de.campussource.cse.cdmm.domain.Attribute;
-
-public class AttributeDao extends DAOJPA<Attribute> {
-
-}
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 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_ACCOUNT")
@XmlRootElement
-@XmlType(propOrder={ "groups", "roles"})
+@XmlType(propOrder={ "groups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Account extends de.campussource.cse.cdmm.domain.Entity{
@OneToMany(mappedBy="account")
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,83 +0,0 @@
-package de.campussource.cse.cdmm.domain;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_ATTRIBUTE")
-@XmlRootElement
-@XmlType(propOrder={"identityString", "entity", "name", "value"})
-public class Attribute {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
- private String name;
-
- private String value;
-
- @ManyToOne
- @JoinColumn(name="ENTITY_ID")
- private de.campussource.cse.cdmm.domain.Entity entity;
-
-
- @XmlElement()
- public String getName() {
- return name;
- }
-
-
- public void setName(String name) {
- this.name = name;
- }
-
- @XmlElement
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @XmlElement
- public de.campussource.cse.cdmm.domain.Entity getEntity() {
- return entity;
- }
-
-
- public void setEntity(de.campussource.cse.cdmm.domain.Entity entity) {
- this.entity = entity;
- }
-
- @XmlTransient
- public Long getId() {
- return id;
- }
-
-
- public void setId(Long id) {
- this.id = id;
- }
-
-}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_CATEGORY")
@XmlRootElement
-@XmlType(propOrder={ "parents", "children", "courses"})
+@XmlType(propOrder={ "parents", "children", "courses"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Category extends de.campussource.cse.cdmm.domain.Entity {
@ManyToMany
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-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -19,11 +19,13 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_COURSE")
@XmlRootElement
-@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"})
+@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Course extends de.campussource.cse.cdmm.domain.Entity{
@ManyToOne
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-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,43 +1,29 @@
package de.campussource.cse.cdmm.domain;
-import java.util.List;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.OneToMany;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.IdAdapter;
@XmlRootElement
-@XmlType(propOrder={"id","attributes"})
+@XmlType(propOrder={"id"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- @OneToMany(mappedBy="entity")
- @XmlTransient
- private List<Attribute> attributes;
-
- @XmlElementWrapper(name="attributes")
- @XmlElement(name="attribute")
- public List<Attribute> getAttributes(){
- return attributes;
- }
-
public Entity(){
}
@@ -71,10 +57,6 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
}
- public void setAttributes(List<Attribute> attributes) {
- this.attributes = attributes;
- }
-
public void setId(Long id) {
this.id = id;
}
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 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -7,21 +7,21 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
+
@XmlRootElement
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class EntityContainer{
@XmlElementWrapper(name="entities")
@XmlElement(name="entity")
private List<Entity> entities;
- @XmlElementWrapper(name="attributes")
- @XmlElement(name="attribute")
- private List<Attribute> attributes;
-
@XmlElementWrapper(name="categories")
@XmlElement(name="category")
private List<Category> categories;
@@ -42,10 +42,6 @@
this.entities = entities;
}
- public void setAttributes(List<Attribute> attributes) {
- this.attributes = attributes;
- }
-
public void setCategories(List<Category> categories) {
this.categories = categories;
}
@@ -68,11 +64,6 @@
}
@XmlTransient
- public List<Attribute> getAttributes() {
- return attributes;
- }
-
- @XmlTransient
public List<Category> getCategories() {
return categories;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_GROUP")
@XmlRootElement
-@XmlType(propOrder={"members"})
+@XmlType(propOrder={"members"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Group extends Account{
@ManyToMany(mappedBy="groups")
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-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -11,13 +11,14 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.RoleType;
@Entity
@Embeddable
@Table(name = "CDMM_ROLE")
@XmlRootElement
-@XmlType(propOrder={"type", "account", "course"})
+@XmlType(propOrder={"type", "account", "course"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Role extends de.campussource.cse.cdmm.domain.Entity{
@Column(name="ROLE_TYPE")
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 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -21,7 +21,6 @@
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
import de.campussource.cse.cdmm.domain.Account;
-import de.campussource.cse.cdmm.domain.Attribute;
import de.campussource.cse.cdmm.domain.Category;
import de.campussource.cse.cdmm.domain.Course;
import de.campussource.cse.cdmm.domain.EntityContainer;
@@ -49,6 +48,7 @@
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
} catch (JAXBException e) {
+ e.printStackTrace();
fail(e.getMessage());
}
@@ -134,14 +134,6 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 12:33:06
|
Revision: 49
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=49&view=rev
Author: roekens
Date: 2009-03-04 12:25:48 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
added constructors
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/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.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/Account.java
===================================================================
--- 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)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -32,7 +32,15 @@
inverseJoinColumns={@JoinColumn(name="ACCOUNT_ID")})
private List<Group> groups;
-
+ public Account(){
+ }
+
+ public Account(Long id, List<Group> groups, List<Role> roles){
+ setId(id);
+ this.groups = groups;
+ this.roles = roles;
+ }
+
@XmlElementWrapper(name="roles")
@XmlElement(name="role")
public List<Role> getRoles() {
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -37,6 +37,13 @@
public Category() {
}
+
+ public Category(Long id, List<Category> children, List<Course> courses, List<Category> parents){
+ setId(id);
+ this.children = children;
+ this.courses = courses;
+ this.parents = parents;
+ }
@XmlElementWrapper(name="categories")
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-04 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -43,6 +43,17 @@
@OneToMany(mappedBy="course")
private List<Role> roles;
+ public Course(){
+ }
+
+ public Course(Long id, List<Category> categories, Course parent, List<Role> roles, List<Course> workgroups){
+ setId(id);
+ this.categories = categories;
+ this.parent = parent;
+ this.roles = roles;
+ this.workgroups = workgroups;
+ }
+
public String toString() {
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
}
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-04 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -39,9 +39,12 @@
}
public Entity(){
-
}
+ public Entity(Long id){
+ this.id = id;
+ }
+
public boolean equals(Object obj) {
if (this == obj) {
return true;
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 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -3,7 +3,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -10,7 +10,6 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -23,9 +22,16 @@
@XmlType(propOrder={"members"})
public class Group extends Account{
- @XmlTransient
@ManyToMany(mappedBy="groups")
- public List<Account> members;
+ private List<Account> members;
+
+ public Group(){
+ }
+
+ public Group(Long id, List<Account> members){
+ setId(id);
+ this.members = members;
+ }
public boolean equals(Object obj) {
if (this == obj) {
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-04 12:12:29 UTC (rev 48)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 12:25:48 UTC (rev 49)
@@ -31,6 +31,16 @@
@JoinColumn(name="COURSE_ID")
private Course course;
+ public Role(){
+ }
+
+ public Role(Long id, RoleType type, Account account, Course course ){
+ setId(id);
+ this.type = type;
+ this.account = account;
+ this.course = course;
+ }
+
@XmlElement
public RoleType getType() {
return type;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 12:12:54
|
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.
|
|
From: <ro...@us...> - 2009-03-04 11:56:11
|
Revision: 47
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=47&view=rev
Author: roekens
Date: 2009-03-04 11:56:09 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
bugfixes regarding required attributes
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/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-04 10:43:40 UTC (rev 46)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 11:56:09 UTC (rev 47)
@@ -68,7 +68,7 @@
}
@XmlElementWrapper(name="categories")
- @XmlElement(name="category")
+ @XmlElement(name="category", required=true)
@XmlIDREF
public List<Category> getCategories() {
return categories;
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-04 10:43:40 UTC (rev 46)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 11:56:09 UTC (rev 47)
@@ -40,7 +40,7 @@
this.type = type;
}
- @XmlElement(name="accountId")
+ @XmlElement(name="accountId", required=true)
@XmlIDREF
public Account getAccount() {
return account;
@@ -50,7 +50,7 @@
this.account = account;
}
- @XmlElement(name="courseId")
+ @XmlElement(name="courseId", required=true)
@XmlIDREF
public Course getCourse() {
return course;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 10:43:50
|
Revision: 46
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=46&view=rev
Author: roekens
Date: 2009-03-04 10:43:40 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
- changed package structure for better overview
- introduced first creation of xsd in test
Removed 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/AccountDao.java
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/AttributeDao.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/CategoryDao.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/CourseDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.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/EntityDao.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/main/java/de/campussource/cse/cdmm/GroupDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,57 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_ACCOUNT")
-@XmlRootElement
-@XmlType(propOrder={ "groups", "roles"})
-public class Account extends de.campussource.cse.cdmm.Entity{
-
- @OneToMany(mappedBy="account")
- private List<Role> roles;
-
- @ManyToMany
- @JoinTable(
- name = "CDMM_GROUP2ACCOUNT",
- joinColumns={@JoinColumn(name="GROUP_ID")},
- inverseJoinColumns={@JoinColumn(name="ACCOUNT_ID")})
- private List<Group> groups;
-
-
- @XmlElementWrapper(name="roles")
- @XmlElement(name="role")
- @XmlIDREF
- public List<Role> getRoles() {
- return roles;
- }
-
- public void setRoles(List<Role> roles) {
- this.roles = roles;
- }
-
- @XmlElementWrapper(name="groups")
- @XmlElement(name="group")
- @XmlIDREF
- public List<Group> getGroups() {
- return groups;
- }
-
- public void setGroups(List<Group> groups) {
- this.groups = groups;
- }
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class AccountDao extends DAOJPA<Account> {
-
-}
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,83 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_ATTRIBUTE")
-@XmlRootElement
-@XmlType(propOrder={"identityString", "entity", "name", "value"})
-public class Attribute {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
- private String name;
-
- private String value;
-
- @ManyToOne
- @JoinColumn(name="ENTITY_ID")
- private de.campussource.cse.cdmm.Entity entity;
-
-
- @XmlElement()
- public String getName() {
- return name;
- }
-
-
- public void setName(String name) {
- this.name = name;
- }
-
- @XmlElement
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @XmlElement
- public de.campussource.cse.cdmm.Entity getEntity() {
- return entity;
- }
-
-
- public void setEntity(de.campussource.cse.cdmm.Entity entity) {
- this.entity = entity;
- }
-
- @XmlTransient
- public Long getId() {
- return id;
- }
-
-
- public void setId(Long id) {
- this.id = id;
- }
-
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class AttributeDao extends DAOJPA<Attribute> {
-
-}
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,79 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_CATEGORY")
-@XmlRootElement
-@XmlType(propOrder={ "parents", "children", "courses"})
-public class Category extends de.campussource.cse.cdmm.Entity {
-
- @ManyToMany
- @JoinTable(
- name = "CDMM_CAT2CAT",
- joinColumns={@JoinColumn(name="CHILD_ID")},
- inverseJoinColumns={@JoinColumn(name="PARENT_ID")})
- private List<Category> parents;
-
- @ManyToMany(mappedBy="parent")
- private List<Category> children;
-
- @ManyToMany(mappedBy="categories")
- private List<Course> courses;
-
- protected Category() {
- }
-
-
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category")
- public List<Category> getChildren() {
- return children;
- }
-
- public void setChildren(List<Category> children) {
- this.children = children;
- }
-
- @XmlElementWrapper(name="courses")
- @XmlElement(name="course")
- @XmlIDREF
- public List<Course> getCourses() {
- return courses;
- }
-
- public void setCourses(List<Course> courses) {
- this.courses = courses;
- }
-
- @XmlElementWrapper(name="parents")
- @XmlElement(name="parent")
- @XmlIDREF
- public List<Category> getParents() {
- return parents;
- }
-
- public void setParents(List<Category> parents) {
- this.parents = parents;
- }
-
- @XmlTransient
- public boolean isRoot(){
- return ((parents==null)||parents.size()==0);
- }
-
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,7 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class CategoryDao extends DAOJPA<Category>{
-
-}
\ No newline at end of file
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,91 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_COURSE")
-@XmlRootElement
-@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"})
-public class Course extends de.campussource.cse.cdmm.Entity{
-
- @ManyToOne
- @JoinTable(name="PARENT_ID")
- private Course parent;
-
- @OneToMany(mappedBy="parent")
- private List<Course> workgroups;
-
- @ManyToMany
- @JoinTable(
- name = "CDMM_COURSE2CAT",
- joinColumns={@JoinColumn(name="CATEGORY_ID")},
- inverseJoinColumns={@JoinColumn(name="COURSE_ID")})
- private List<Category> categories;
-
- @OneToMany(mappedBy="course")
- private List<Role> roles;
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
- }
-
- @XmlElement
- @XmlIDREF
- public Course getParent() {
- return parent;
- }
-
- public void setParent(Course parent) {
- this.parent = parent;
- }
-
- @XmlElementWrapper(name="workgroups")
- @XmlElement(name="workgroup")
- public List<Course> getWorkgroups() {
- return workgroups;
- }
-
- public void setWorkgroups(List<Course> workgroups) {
- this.workgroups = workgroups;
- }
-
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category")
- @XmlIDREF
- public List<Category> getCategories() {
- return categories;
- }
-
- public void setCategories(List<Category> categories) {
- this.categories = categories;
- }
-
- @XmlElementWrapper(name="roles")
- @XmlElement(name="role")
- public List<Role> getRoles() {
- return roles;
- }
-
- public void setRoles(List<Role> roles) {
- this.roles = roles;
- }
-
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class CourseDao extends DAOJPA<Course> {
-
-}
\ No newline at end of file
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,13 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.io.Serializable;
-
-public interface DAO<T> {
-
- public T find(Serializable id);
-
- public void persist(T entity);
-
- public void remove(T entity);
-
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,42 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.io.Serializable;
-import java.lang.reflect.ParameterizedType;
-
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-
-public abstract class DAOJPA<E> implements DAO<E> {
-
- @PersistenceContext
- protected EntityManager entityManager;
-
- private Class<E> persistentClass;
-
- public DAOJPA() {
- this.persistentClass = (Class<E>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
- }
-
- @Override
- @TransactionAttribute(TransactionAttributeType.SUPPORTS)
- public E find(Serializable id) {
- return entityManager.find(persistentClass, id);
- }
-
- @Override
- @TransactionAttribute(TransactionAttributeType.MANDATORY)
- public void persist(E entity) {
- entityManager.persist(entity);
- }
-
- @Override
- public void remove(E entity) {
- entityManager.remove(entity);
- }
-
-
-
-}
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,83 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-@XmlRootElement
-@XmlType(propOrder={"id","attributes"})
-public class Entity{
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private Long id;
-
- @OneToMany(mappedBy="entity")
- @XmlTransient
- private List<Attribute> attributes;
-
- @XmlElementWrapper(name="attributes")
- @XmlElement(name="attribute")
- public List<Attribute> getAttributes(){
- return attributes;
- }
-
- public Entity(){
-
- }
-
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Entity)) {
- return false;
- }
- if (this.id == null) {
- return false;
- } else {
- return this.id.equals(((Entity) obj).id);
- }
- }
-
- public int hashCode() {
- if (this.id == null) {
- return super.hashCode();
- } else {
- return this.id.hashCode();
- }
- }
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
- }
-
- public void setAttributes(List<Attribute> attributes) {
- this.attributes = attributes;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @XmlID
- @XmlJavaTypeAdapter(value=IdAdapter.class)
- @XmlAttribute(name="id")
- public Long getId() {
- return id;
- };
-}
\ No newline at end of file
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,116 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-@XmlRootElement
-public class EntityContainer{
-
- @XmlElementWrapper(name="entities")
- @XmlElement(name="entity")
- private List<Entity> entities;
-
- @XmlElementWrapper(name="attributes")
- @XmlElement(name="attribute")
- private List<Attribute> attributes;
-
- @XmlElementWrapper(name="categories")
- @XmlElement(name="category")
- private List<Category> categories;
-
- @XmlElementWrapper(name="courses")
- @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;
-
- @XmlElementWrapper(name="groups")
- @XmlElement(name="group")
- private List<Group> groups;
-
- public void setEntities(List<Entity> entities) {
- this.entities = entities;
- }
-
- public void setAttributes(List<Attribute> attributes) {
- this.attributes = attributes;
- }
-
- public void setCategories(List<Category> categories) {
- this.categories = categories;
- }
-
- public void setCourses(List<Course> courses) {
- this.courses = courses;
- }
-
- public void setRoles(List<Role> roles) {
- this.roles = roles;
- }
-
- public void setAccounts(List<Account> accounts) {
- this.accounts = accounts;
- }
-
- 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;
- }
-
- @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();
- }
-
-
-
-}
\ No newline at end of file
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class EntityDao extends DAOJPA<Entity> {
-
-}
Deleted: 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-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,66 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-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.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_GROUP")
-@XmlRootElement
-@XmlType(propOrder={"members"})
-public class Group extends Account{
-
- @XmlTransient
- @ManyToMany(mappedBy="groups")
- public List<Account> members;
-
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Group)) {
- return false;
- }
- if (this.getId() == null) {
- return false;
- } else {
- return this.getId().equals(((Group) obj).getId());
- }
- }
-
- public int hashCode() {
- if (this.getId() == null) {
- return super.hashCode();
- } else {
- return this.getId().hashCode();
- }
- }
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString();
- }
-
- public void setMembers(List<Account> members) {
- this.members = members;
- }
-
- @XmlElementWrapper(name="members")
- @XmlElement(name="member")
- @XmlIDREF
- public List<Account> getMembers() {
- return members;
- }
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class GroupDao extends DAOJPA<Group> {
-
-}
\ No newline at end of file
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,61 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@Entity
-@Embeddable
-@Table(name = "CDMM_ROLE")
-@XmlRootElement
-@XmlType(propOrder={"type", "account", "course"})
-public class Role extends de.campussource.cse.cdmm.Entity{
-
- @Column(name="ROLE_TYPE")
- private RoleType type;
-
- @ManyToOne
- @JoinColumn(name="ACCOUNT_ID")
- private Account account;
-
- @ManyToOne
- @JoinColumn(name="COURSE_ID")
- private Course course;
-
- @XmlElement
- public RoleType getType() {
- return type;
- }
-
- public void setType(RoleType type) {
- this.type = type;
- }
-
- @XmlElement(name="accountId")
- @XmlIDREF
- public Account getAccount() {
- return account;
- }
-
- public void setAccount(Account account) {
- this.account = account;
- }
-
- @XmlElement(name="courseId")
- @XmlIDREF
- public Course getCourse() {
- return course;
- }
-
- public void setCourse(Course course) {
- this.course = course;
- }
-}
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java 2009-03-04 10:42:37 UTC (rev 45)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java 2009-03-04 10:43:40 UTC (rev 46)
@@ -1,6 +0,0 @@
-package de.campussource.cse.cdmm;
-import de.campussource.cse.cdmm.DAOJPA;
-
-public class RoleDao extends DAOJPA<Role> {
-
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-04 10:42:43
|
Revision: 45
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=45&view=rev
Author: roekens
Date: 2009-03-04 10:42:37 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
- changed package structure for better overview
- introduced first creation of xsd in test
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/
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/Attribute.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
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/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm.dao;
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Account;
+
+public class AccountDao extends DAOJPA<Account> {
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm.dao;
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Attribute;
+
+public class AttributeDao extends DAOJPA<Attribute> {
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,8 @@
+package de.campussource.cse.cdmm.dao;
+
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Category;
+
+public class CategoryDao extends DAOJPA<Category>{
+
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm.dao;
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Course;
+
+public class CourseDao extends DAOJPA<Course> {
+
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,13 @@
+package de.campussource.cse.cdmm.dao;
+
+import java.io.Serializable;
+
+public interface DAO<T> {
+
+ public T find(Serializable id);
+
+ public void persist(T entity);
+
+ public void remove(T entity);
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,42 @@
+package de.campussource.cse.cdmm.dao;
+
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+
+public abstract class DAOJPA<E> implements DAO<E> {
+
+ @PersistenceContext
+ protected EntityManager entityManager;
+
+ private Class<E> persistentClass;
+
+ public DAOJPA() {
+ this.persistentClass = (Class<E>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+ }
+
+ @Override
+ @TransactionAttribute(TransactionAttributeType.SUPPORTS)
+ public E find(Serializable id) {
+ return entityManager.find(persistentClass, id);
+ }
+
+ @Override
+ @TransactionAttribute(TransactionAttributeType.MANDATORY)
+ public void persist(E entity) {
+ entityManager.persist(entity);
+ }
+
+ @Override
+ public void remove(E entity) {
+ entityManager.remove(entity);
+ }
+
+
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,8 @@
+package de.campussource.cse.cdmm.dao;
+import com.sun.xml.internal.stream.Entity;
+
+import de.campussource.cse.cdmm.dao.DAOJPA;
+
+public class EntityDao extends DAOJPA<Entity> {
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm.dao;
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Group;
+
+public class GroupDao extends DAOJPA<Group> {
+
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm.dao;
+import de.campussource.cse.cdmm.dao.DAOJPA;
+import de.campussource.cse.cdmm.domain.Role;
+
+public class RoleDao extends DAOJPA<Role> {
+
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,57 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_ACCOUNT")
+@XmlRootElement
+@XmlType(propOrder={ "groups", "roles"})
+public class Account extends de.campussource.cse.cdmm.domain.Entity{
+
+ @OneToMany(mappedBy="account")
+ private List<Role> roles;
+
+ @ManyToMany
+ @JoinTable(
+ name = "CDMM_GROUP2ACCOUNT",
+ joinColumns={@JoinColumn(name="GROUP_ID")},
+ inverseJoinColumns={@JoinColumn(name="ACCOUNT_ID")})
+ private List<Group> groups;
+
+
+ @XmlElementWrapper(name="roles")
+ @XmlElement(name="role")
+ @XmlIDREF
+ public List<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(List<Role> roles) {
+ this.roles = roles;
+ }
+
+ @XmlElementWrapper(name="groups")
+ @XmlElement(name="group")
+ @XmlIDREF
+ public List<Group> getGroups() {
+ return groups;
+ }
+
+ public void setGroups(List<Group> groups) {
+ this.groups = groups;
+ }
+}
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,83 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_ATTRIBUTE")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "entity", "name", "value"})
+public class Attribute {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
+ private Long id;
+
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
+
+ private String name;
+
+ private String value;
+
+ @ManyToOne
+ @JoinColumn(name="ENTITY_ID")
+ private de.campussource.cse.cdmm.domain.Entity entity;
+
+
+ @XmlElement()
+ public String getName() {
+ return name;
+ }
+
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @XmlElement
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @XmlElement
+ public de.campussource.cse.cdmm.domain.Entity getEntity() {
+ return entity;
+ }
+
+
+ public void setEntity(de.campussource.cse.cdmm.domain.Entity entity) {
+ this.entity = entity;
+ }
+
+ @XmlTransient
+ public Long getId() {
+ return id;
+ }
+
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+}
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,79 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_CATEGORY")
+@XmlRootElement
+@XmlType(propOrder={ "parents", "children", "courses"})
+public class Category extends de.campussource.cse.cdmm.domain.Entity {
+
+ @ManyToMany
+ @JoinTable(
+ name = "CDMM_CAT2CAT",
+ joinColumns={@JoinColumn(name="CHILD_ID")},
+ inverseJoinColumns={@JoinColumn(name="PARENT_ID")})
+ private List<Category> parents;
+
+ @ManyToMany(mappedBy="parent")
+ private List<Category> children;
+
+ @ManyToMany(mappedBy="categories")
+ private List<Course> courses;
+
+ public Category() {
+ }
+
+
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
+ public List<Category> getChildren() {
+ return children;
+ }
+
+ public void setChildren(List<Category> children) {
+ this.children = children;
+ }
+
+ @XmlElementWrapper(name="courses")
+ @XmlElement(name="course")
+ @XmlIDREF
+ public List<Course> getCourses() {
+ return courses;
+ }
+
+ public void setCourses(List<Course> courses) {
+ this.courses = courses;
+ }
+
+ @XmlElementWrapper(name="parents")
+ @XmlElement(name="parent")
+ @XmlIDREF
+ public List<Category> getParents() {
+ return parents;
+ }
+
+ public void setParents(List<Category> parents) {
+ this.parents = parents;
+ }
+
+ @XmlTransient
+ public boolean isRoot(){
+ return ((parents==null)||parents.size()==0);
+ }
+
+}
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,91 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_COURSE")
+@XmlRootElement
+@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"})
+public class Course extends de.campussource.cse.cdmm.domain.Entity{
+
+ @ManyToOne
+ @JoinTable(name="PARENT_ID")
+ private Course parent;
+
+ @OneToMany(mappedBy="parent")
+ private List<Course> workgroups;
+
+ @ManyToMany
+ @JoinTable(
+ name = "CDMM_COURSE2CAT",
+ joinColumns={@JoinColumn(name="CATEGORY_ID")},
+ inverseJoinColumns={@JoinColumn(name="COURSE_ID")})
+ private List<Category> categories;
+
+ @OneToMany(mappedBy="course")
+ private List<Role> roles;
+
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public Course getParent() {
+ return parent;
+ }
+
+ public void setParent(Course parent) {
+ this.parent = parent;
+ }
+
+ @XmlElementWrapper(name="workgroups")
+ @XmlElement(name="workgroup")
+ public List<Course> getWorkgroups() {
+ return workgroups;
+ }
+
+ public void setWorkgroups(List<Course> workgroups) {
+ this.workgroups = workgroups;
+ }
+
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
+ @XmlIDREF
+ public List<Category> getCategories() {
+ return categories;
+ }
+
+ public void setCategories(List<Category> categories) {
+ this.categories = categories;
+ }
+
+ @XmlElementWrapper(name="roles")
+ @XmlElement(name="role")
+ public List<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(List<Role> roles) {
+ this.roles = roles;
+ }
+
+}
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,85 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import de.campussource.cse.cdmm.IdAdapter;
+
+@XmlRootElement
+@XmlType(propOrder={"id","attributes"})
+public class Entity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @OneToMany(mappedBy="entity")
+ @XmlTransient
+ private List<Attribute> attributes;
+
+ @XmlElementWrapper(name="attributes")
+ @XmlElement(name="attribute")
+ public List<Attribute> getAttributes(){
+ return attributes;
+ }
+
+ public Entity(){
+
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Entity)) {
+ return false;
+ }
+ if (this.id == null) {
+ return false;
+ } else {
+ return this.id.equals(((Entity) obj).id);
+ }
+ }
+
+ public int hashCode() {
+ if (this.id == null) {
+ return super.hashCode();
+ } else {
+ return this.id.hashCode();
+ }
+ }
+
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
+ }
+
+ public void setAttributes(List<Attribute> attributes) {
+ this.attributes = attributes;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @XmlID
+ @XmlJavaTypeAdapter(value=IdAdapter.class)
+ @XmlAttribute(name="id")
+ public Long getId() {
+ return id;
+ };
+}
\ No newline at end of file
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,116 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@XmlRootElement
+public class EntityContainer{
+
+ @XmlElementWrapper(name="entities")
+ @XmlElement(name="entity")
+ private List<Entity> entities;
+
+ @XmlElementWrapper(name="attributes")
+ @XmlElement(name="attribute")
+ private List<Attribute> attributes;
+
+ @XmlElementWrapper(name="categories")
+ @XmlElement(name="category")
+ private List<Category> categories;
+
+ @XmlElementWrapper(name="courses")
+ @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;
+
+ @XmlElementWrapper(name="groups")
+ @XmlElement(name="group")
+ private List<Group> groups;
+
+ public void setEntities(List<Entity> entities) {
+ this.entities = entities;
+ }
+
+ public void setAttributes(List<Attribute> attributes) {
+ this.attributes = attributes;
+ }
+
+ public void setCategories(List<Category> categories) {
+ this.categories = categories;
+ }
+
+ public void setCourses(List<Course> courses) {
+ this.courses = courses;
+ }
+
+ public void setRoles(List<Role> roles) {
+ this.roles = roles;
+ }
+
+ public void setAccounts(List<Account> accounts) {
+ this.accounts = accounts;
+ }
+
+ 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;
+ }
+
+ @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();
+ }
+
+
+
+}
\ No newline at end of file
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,66 @@
+package de.campussource.cse.cdmm.domain;
+
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_GROUP")
+@XmlRootElement
+@XmlType(propOrder={"members"})
+public class Group extends Account{
+
+ @XmlTransient
+ @ManyToMany(mappedBy="groups")
+ public List<Account> members;
+
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Group)) {
+ return false;
+ }
+ if (this.getId() == null) {
+ return false;
+ } else {
+ return this.getId().equals(((Group) obj).getId());
+ }
+ }
+
+ public int hashCode() {
+ if (this.getId() == null) {
+ return super.hashCode();
+ } else {
+ return this.getId().hashCode();
+ }
+ }
+
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString();
+ }
+
+ public void setMembers(List<Account> members) {
+ this.members = members;
+ }
+
+ @XmlElementWrapper(name="members")
+ @XmlElement(name="member")
+ @XmlIDREF
+ public List<Account> getMembers() {
+ return members;
+ }
+}
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -0,0 +1,62 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import de.campussource.cse.cdmm.RoleType;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_ROLE")
+@XmlRootElement
+@XmlType(propOrder={"type", "account", "course"})
+public class Role extends de.campussource.cse.cdmm.domain.Entity{
+
+ @Column(name="ROLE_TYPE")
+ private RoleType type;
+
+ @ManyToOne
+ @JoinColumn(name="ACCOUNT_ID")
+ private Account account;
+
+ @ManyToOne
+ @JoinColumn(name="COURSE_ID")
+ private Course course;
+
+ @XmlElement
+ public RoleType getType() {
+ return type;
+ }
+
+ public void setType(RoleType type) {
+ this.type = type;
+ }
+
+ @XmlElement(name="accountId")
+ @XmlIDREF
+ public Account getAccount() {
+ return account;
+ }
+
+ public void setAccount(Account account) {
+ this.account = account;
+ }
+
+ @XmlElement(name="courseId")
+ @XmlIDREF
+ public Course getCourse() {
+ return course;
+ }
+
+ public void setCourse(Course course) {
+ this.course = course;
+ }
+}
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 17:20:35 UTC (rev 44)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-04 10:42:37 UTC (rev 45)
@@ -10,8 +10,24 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import javax.xml.bind.SchemaOutputResolver;
import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.Result;
+import javax.xml.transform.dom.DOMResult;
+import org.w3c.dom.Document;
+
+import com.sun.org.apache.xml.internal.serialize.OutputFormat;
+import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+
+import de.campussource.cse.cdmm.domain.Account;
+import de.campussource.cse.cdmm.domain.Attribute;
+import de.campussource.cse.cdmm.domain.Category;
+import de.campussource.cse.cdmm.domain.Course;
+import de.campussource.cse.cdmm.domain.EntityContainer;
+import de.campussource.cse.cdmm.domain.Group;
+import de.campussource.cse.cdmm.domain.Role;
+
import junit.framework.TestCase;
/**
@@ -52,7 +68,6 @@
}
System.out.println(outputXml);
- EntityContainer xmlToObjects;
try {
Unmarshaller unmarshaller = context.createUnmarshaller();
EntityContainer ec = (EntityContainer) unmarshaller.unmarshal(new StringReader(outputXml));
@@ -61,9 +76,35 @@
fail(e.getMessage());
}
+ final List<DOMResult> results = new ArrayList<DOMResult>();
+ try {
+ context.generateSchema(
+ new SchemaOutputResolver() {
+ @Override
+ public Result createOutput(String ns, String file) throws IOException {
+ DOMResult result = new DOMResult();
+ result.setSystemId(file);
+ results.add(result);
+ return result;
+ }
+ });
+ printDOMResult(results.get(0));
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
}
+
+ private void printDOMResult(DOMResult domResult) throws IOException{
+ Document doc = (Document) domResult.getNode();
+ OutputFormat format = new OutputFormat(doc);
+ format.setIndenting(true);
+ XMLSerializer serializer = new XMLSerializer(System.out, format);
+ serializer.serialize(doc);
+ }
private EntityContainer generateTestStructure() {
Category categoryA = new Category();
@@ -108,7 +149,7 @@
role.setId(createUniqueId());
role.setAccount(account);
role.setCourse(course);
- role.setType(RoleType.ASSISTENT);
+ role.setType(RoleType.ASSISTANT);
List<Role> roles = new ArrayList<Role>();
roles.add(role);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <id...@us...> - 2009-03-03 17:20:37
|
Revision: 44
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=44&view=rev
Author: idueppe
Date: 2009-03-03 17:20:35 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
xml refactoring
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
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.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 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -4,9 +4,6 @@
import javax.persistence.Embeddable;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
@@ -14,33 +11,17 @@
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.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
@Entity
@Embeddable
@Table(name = "CDMM_ACCOUNT")
@XmlRootElement
-@XmlType(propOrder={"identityString", "groups", "roles"})
+@XmlType(propOrder={ "groups", "roles"})
public class Account extends de.campussource.cse.cdmm.Entity{
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
@OneToMany(mappedBy="account")
private List<Role> roles;
@@ -52,41 +33,6 @@
private List<Group> groups;
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Account)) {
- return false;
- }
- if (this.id == null) {
- return false;
- } else {
- return this.id.equals(((Account) obj).id);
- }
- }
-
- public int hashCode() {
- if (this.id == null) {
- return super.hashCode();
- } else {
- return this.id.hashCode();
- }
- }
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
- }
-
- @XmlTransient
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
@XmlElementWrapper(name="roles")
@XmlElement(name="role")
@XmlIDREF
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 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -4,42 +4,24 @@
import javax.persistence.Embeddable;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
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.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
@Entity
@Embeddable
@Table(name = "CDMM_CATEGORY")
@XmlRootElement
-@XmlType(propOrder={"identityString", "parents", "children", "courses"})
+@XmlType(propOrder={ "parents", "children", "courses"})
public class Category extends de.campussource.cse.cdmm.Entity {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
@ManyToMany
@JoinTable(
name = "CDMM_CAT2CAT",
@@ -56,41 +38,7 @@
protected Category() {
}
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Category)) {
- return false;
- }
- if (this.id == null) {
- return false;
- } else {
- return this.id.equals(((Category) obj).id);
- }
- }
- public int hashCode() {
- if (this.id == null) {
- return super.hashCode();
- } else {
- return this.id.hashCode();
- }
- }
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
- }
-
- @XmlTransient
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
@XmlElementWrapper(name="categories")
@XmlElement(name="category")
public List<Category> getChildren() {
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 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -4,9 +4,6 @@
import javax.persistence.Embeddable;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
@@ -15,10 +12,8 @@
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.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -28,20 +23,9 @@
@Embeddable
@Table(name = "CDMM_COURSE")
@XmlRootElement
-@XmlType(propOrder={"identityString", "categories", "parent", "workgroups", "roles"})
+@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"})
public class Course extends de.campussource.cse.cdmm.Entity{
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
@ManyToOne
@JoinTable(name="PARENT_ID")
private Course parent;
@@ -59,41 +43,10 @@
@OneToMany(mappedBy="course")
private List<Role> roles;
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Course)) {
- return false;
- }
- if (this.id == null) {
- return false;
- } else {
- return this.id.equals(((Course) obj).id);
- }
- }
-
- public int hashCode() {
- if (this.id == null) {
- return super.hashCode();
- } else {
- return this.id.hashCode();
- }
- }
-
public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
+ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString();
}
- @XmlTransient
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
@XmlElement
@XmlIDREF
public Course getParent() {
@@ -127,7 +80,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/Entity.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-03 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -6,21 +6,26 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
@XmlRootElement
-@XmlType(propOrder={"attributes"})
+@XmlType(propOrder={"id","attributes"})
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
private Long id;
-
+
@OneToMany(mappedBy="entity")
@XmlTransient
private List<Attribute> attributes;
@@ -34,7 +39,33 @@
public Entity(){
}
+
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Entity)) {
+ return false;
+ }
+ if (this.id == null) {
+ return false;
+ } else {
+ return this.id.equals(((Entity) obj).id);
+ }
+ }
+ public int hashCode() {
+ if (this.id == null) {
+ return super.hashCode();
+ } else {
+ return this.id.hashCode();
+ }
+ }
+
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
+ }
+
public void setAttributes(List<Attribute> attributes) {
this.attributes = attributes;
}
@@ -43,7 +74,9 @@
this.id = id;
}
- @XmlTransient
+ @XmlID
+ @XmlJavaTypeAdapter(value=IdAdapter.class)
+ @XmlAttribute(name="id")
public Long getId() {
return id;
};
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 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityContainer.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -3,10 +3,15 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
@XmlRootElement
public class EntityContainer{
@@ -27,11 +32,11 @@
private List<Course> courses;
@XmlElementWrapper(name="roles")
- @XmlElement(name="role")
+ @XmlElementRef(name="role")
private List<Role> roles;
@XmlElementWrapper(name="accounts")
- @XmlElement(name="account")
+ @XmlElements(value= {@XmlElement(name="account",type=Account.class),@XmlElement(name="group",type=Group.class)})
private List<Account> accounts;
@XmlElementWrapper(name="groups")
@@ -100,5 +105,12 @@
public List<Group> getGroups() {
return groups;
}
+
+ @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();
+ }
+
+
}
\ 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 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -4,9 +4,6 @@
import javax.persistence.Embeddable;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
@@ -25,18 +22,8 @@
@XmlRootElement
@XmlType(propOrder={"members"})
public class Group extends Account{
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private Long id;
@XmlTransient
- @Override
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
- @XmlTransient
@ManyToMany(mappedBy="groups")
public List<Account> members;
@@ -70,15 +57,6 @@
this.members = members;
}
- @XmlTransient
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
@XmlElementWrapper(name="members")
@XmlElement(name="member")
@XmlIDREF
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -0,0 +1,20 @@
+package de.campussource.cse.cdmm;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class IdAdapter extends XmlAdapter<String, Long>{
+
+
+
+ @Override
+ public Long unmarshal(String v) throws Exception {
+ return Long.parseLong(v);
+ }
+
+ @Override
+ public String marshal(Long v) throws Exception {
+ return String.valueOf(v);
+ }
+
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-03 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -3,40 +3,22 @@
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
@Entity
@Embeddable
@Table(name = "CDMM_ROLE")
@XmlRootElement
-@XmlType(propOrder={"identityString", "type", "account", "course"})
+@XmlType(propOrder={"type", "account", "course"})
public class Role extends de.campussource.cse.cdmm.Entity{
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @XmlTransient
- private Long id;
-
- @XmlID
- @XmlElement(name="id")
- public String getIdentityString( ) {
- return ( id != null ) ? id.toString() : "0";
- }
-
@Column(name="ROLE_TYPE")
private RoleType type;
@@ -48,34 +30,6 @@
@JoinColumn(name="COURSE_ID")
private Course course;
-
-
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Role)) {
- return false;
- }
- if (this.id == null) {
- return false;
- } else {
- return this.id.equals(((Role) obj).id);
- }
- }
-
- public int hashCode() {
- if (this.id == null) {
- return super.hashCode();
- } else {
- return this.id.hashCode();
- }
- }
-
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).append(type.toString()).toString();
- }
-
@XmlElement
public RoleType getType() {
return type;
@@ -85,16 +39,7 @@
this.type = type;
}
- @XmlTransient
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @XmlElement
+ @XmlElement(name="accountId")
@XmlIDREF
public Account getAccount() {
return account;
@@ -104,7 +49,7 @@
this.account = account;
}
- @XmlElement
+ @XmlElement(name="courseId")
@XmlIDREF
public Course getCourse() {
return course;
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java 2009-03-03 16:16:01 UTC (rev 43)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java 2009-03-03 17:20:35 UTC (rev 44)
@@ -5,10 +5,10 @@
@XmlEnum
public enum RoleType{
- @XmlEnumValue(value="0")
+ @XmlEnumValue(value="UNDEFINED")
UNDEFINED,
- @XmlEnumValue(value="1")
+ @XmlEnumValue(value="PARTICIPANT")
PARTICIPANT,
- @XmlEnumValue(value="2")
- ASSISTENT
+ @XmlEnumValue(value="ASSISTANT")
+ ASSISTANT
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-03 16:16:12
|
Revision: 43
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=43&view=rev
Author: roekens
Date: 2009-03-03 16:16:01 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
bugfixing
Modified Paths:
--------------
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/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 13:36:45 UTC (rev 42)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-03 16:16:01 UTC (rev 43)
@@ -1,6 +1,7 @@
package de.campussource.cse.cdmm;
import java.io.IOException;
+import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
@@ -9,6 +10,7 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
import junit.framework.TestCase;
@@ -36,20 +38,31 @@
EntityContainer container = generateTestStructure();
+
+ String outputXml = "";
try {
- marshaller.marshal(container, System.out);
-
Writer writer = new StringWriter();
marshaller.marshal(container, writer);
- writer.close();
-
+ outputXml = writer.toString();
+ writer.close();
} catch (JAXBException e) {
fail(e.getMessage());
} catch (IOException e) {
fail(e.getMessage());
}
-
+ System.out.println(outputXml);
+ EntityContainer xmlToObjects;
+ try {
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ EntityContainer ec = (EntityContainer) unmarshaller.unmarshal(new StringReader(outputXml));
+ System.out.println(ec.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+
+
+
}
private EntityContainer generateTestStructure() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-03 13:37:28
|
Revision: 42
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=42&view=rev
Author: roekens
Date: 2009-03-03 13:36:45 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
fix to define property order in xml conversion. still buggy due to inheritance
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/Attribute.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/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.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/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-03 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -16,6 +16,7 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -25,7 +26,8 @@
@Entity
@Embeddable
@Table(name = "CDMM_ACCOUNT")
-@XmlType(name="Account")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "groups", "roles"})
public class Account extends de.campussource.cse.cdmm.Entity{
@Id
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -10,11 +10,15 @@
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
@Entity
@Embeddable
@Table(name = "CDMM_ATTRIBUTE")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "entity", "name", "value"})
public class Attribute {
@Id
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -15,6 +15,7 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -24,7 +25,8 @@
@Entity
@Embeddable
@Table(name = "CDMM_CATEGORY")
-@XmlType(name="Category")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "parents", "children", "courses"})
public class Category extends de.campussource.cse.cdmm.Entity {
@Id
@@ -120,5 +122,10 @@
public void setParents(List<Category> parents) {
this.parents = parents;
}
+
+ @XmlTransient
+ public boolean isRoot(){
+ return ((parents==null)||parents.size()==0);
+ }
}
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -17,7 +17,9 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -25,6 +27,8 @@
@Entity
@Embeddable
@Table(name = "CDMM_COURSE")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "categories", "parent", "workgroups", "roles"})
public class Course extends de.campussource.cse.cdmm.Entity{
@Id
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -8,8 +8,12 @@
import javax.persistence.OneToMany;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+@XmlRootElement
+@XmlType(propOrder={"attributes"})
public class Entity{
@Id
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -9,11 +9,10 @@
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;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -23,7 +22,8 @@
@Entity
@Embeddable
@Table(name = "CDMM_GROUP")
-@XmlType(name="Group")
+@XmlRootElement
+@XmlType(propOrder={"members"})
public class Group extends Account{
@Id
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-03 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -12,7 +12,9 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -20,6 +22,8 @@
@Entity
@Embeddable
@Table(name = "CDMM_ROLE")
+@XmlRootElement
+@XmlType(propOrder={"identityString", "type", "account", "course"})
public class Role extends de.campussource.cse.cdmm.Entity{
@Id
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 12:45:56 UTC (rev 41)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-03 13:36:45 UTC (rev 42)
@@ -34,6 +34,25 @@
fail(e.getMessage());
}
+ EntityContainer container = generateTestStructure();
+
+ try {
+ marshaller.marshal(container, System.out);
+
+ Writer writer = new StringWriter();
+ marshaller.marshal(container, writer);
+ writer.close();
+
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+
+
+ }
+
+ private EntityContainer generateTestStructure() {
Category categoryA = new Category();
categoryA.setId(createUniqueId());
@@ -46,6 +65,9 @@
Course course = new Course();
course.setId(createUniqueId());
course.setCategories(categories);
+
+ List<Course> cl = new ArrayList<Course>(); cl.add(course);
+ categoryA.setCourses(cl);
Account account = new Account();
account.setId(createUniqueId());
@@ -100,24 +122,7 @@
List<Role> rols = new ArrayList<Role>();
rols.add(role);
container.setRoles(rols);
-
-
-
-
- try {
- marshaller.marshal(container, System.out);
-
- Writer writer = new StringWriter();
- marshaller.marshal(container, writer);
- writer.close();
-
- } catch (JAXBException e) {
- fail(e.getMessage());
- } catch (IOException e) {
- fail(e.getMessage());
- }
-
-
+ return container;
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-03 12:46:01
|
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.
|
|
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.
|
|
From: <ro...@us...> - 2009-03-03 10:08:54
|
Revision: 39
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=39&view=rev
Author: roekens
Date: 2009-03-03 10:08:44 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
Workaround for the @XmlID tag.
The tag requires string attribute, but our ids are long. so ids have to be marked as transient and a getter method must be introduced to convert value. the name of the method is changed to id, so that conversion is transparent for the resulting xml.
there don't seem to exist converters in jaxb to do this conveniantly
-> still some inheritance issues with jaxb
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/Attribute.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/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.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-02 16:52:25 UTC (rev 38)
+++ 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)
@@ -15,6 +15,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -28,12 +29,14 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
@OneToMany(mappedBy="account")
private List<Role> roles;
@@ -72,7 +75,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
}
- @XmlElement
+ @XmlTransient
public Long getId() {
return id;
}
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-02 16:52:25 UTC (rev 38)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java 2009-03-03 10:08:44 UTC (rev 39)
@@ -10,7 +10,7 @@
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
@Entity
@Embeddable
@@ -19,12 +19,14 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
private String name;
@@ -64,7 +66,7 @@
this.entity = entity;
}
-
+ @XmlTransient
public Long getId() {
return id;
}
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-02 16:52:25 UTC (rev 38)
+++ 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)
@@ -14,6 +14,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -27,12 +28,14 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
@ManyToMany
@JoinTable(
@@ -76,7 +79,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
}
- @XmlElement
+ @XmlTransient
public Long getId() {
return id;
}
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-02 16:52:25 UTC (rev 38)
+++ 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)
@@ -16,6 +16,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -27,12 +28,14 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
@OneToMany(mappedBy="course")
private List<Account> members;
@@ -80,7 +83,7 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString();
}
- @XmlElement
+ @XmlTransient
public Long getId() {
return id;
}
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-02 16:52:25 UTC (rev 38)
+++ 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)
@@ -8,12 +8,13 @@
import javax.persistence.OneToMany;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
@OneToMany(mappedBy="entity")
@@ -34,5 +35,10 @@
public void setId(Long id) {
this.id = id;
+ }
+
+ @XmlTransient
+ public Long getId() {
+ return id;
};
}
\ 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-02 16:52:25 UTC (rev 38)
+++ 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)
@@ -12,6 +12,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -26,13 +27,15 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
+
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
@XmlElement
- @XmlIDREF
+ @XmlIDREF()
@ManyToMany(mappedBy="groups")
public List<Account> members;
@@ -66,7 +69,7 @@
this.members = members;
}
- @XmlElement
+ @XmlTransient
public Long getId() {
return id;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-02 16:52:25 UTC (rev 38)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-03 10:08:44 UTC (rev 39)
@@ -12,6 +12,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -23,12 +24,14 @@
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
+ @XmlTransient
private Long id;
- @XmlID
- public String getIdAsString(){
- return id.toString();
- }
+ @XmlID
+ @XmlElement(name="id")
+ public String getIdentityString( ) {
+ return ( id != null ) ? id.toString() : "0";
+ }
@Column(name="ROLE_TYPE")
private RoleType type;
@@ -78,7 +81,7 @@
this.type = type;
}
- @XmlElement
+ @XmlTransient
public Long getId() {
return id;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-03-02 16:52:32
|
Revision: 38
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=38&view=rev
Author: roekens
Date: 2009-03-02 16:52:25 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
bugfixing
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/Attribute.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/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -31,7 +31,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -22,7 +22,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
@@ -55,7 +55,6 @@
}
@XmlElement
- @XmlIDREF
public de.campussource.cse.cdmm.Entity getEntity() {
return entity;
}
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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -30,7 +30,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -30,7 +30,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -10,18 +10,12 @@
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement
public class Entity{
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
- @XmlID
- public String getIdAsLong(){
- return id.toString();
- }
-
@OneToMany(mappedBy="entity")
private List<Attribute> attributes;
@@ -38,10 +32,6 @@
this.attributes = attributes;
}
- public Long getId() {
- return id;
- }
-
public void setId(Long id) {
this.id = id;
};
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-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -28,7 +28,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
@XmlElement
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-02 16:41:01 UTC (rev 37)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-02 16:52:25 UTC (rev 38)
@@ -26,7 +26,7 @@
private Long id;
@XmlID
- public String getIdAsLong(){
+ public String getIdAsString(){
return id.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
