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