Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[59] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/ de/campussource/cse/cdmm/domain
|
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.
|
