Menu
▾
▴
cse-ip-svn-commits
|
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 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-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 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 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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X