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