Menu
▾
▴
cse-ip-svn-commits
|
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.
|
|
From: <ro...@us...> - 2009-03-02 14:49:06
|
Revision: 35
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=35&view=rev
Author: roekens
Date: 2009-03-02 14:49:04 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
initial commit of cdmm
tests to follow
Added 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/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/DataModelManager.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.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/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
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,95 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+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.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Table(name = "CDMM_ACCOUNT")
+@XmlType(name="Account")
+public class Account extends de.campussource.cse.cdmm.Entity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @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;
+
+
+ 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();
+ }
+
+ @XmlElement
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(List<Role> roles) {
+ this.roles = roles;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Group> getGroups() {
+ return groups;
+ }
+
+ public void setGroups(List<Group> groups) {
+ this.groups = groups;
+ }
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Account.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,6 @@
+package de.campussource.cse.cdmm;
+import de.campussource.cse.cdmm.DAOJPA;
+
+public class AccountDao extends DAOJPA<Account> {
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,55 @@
+package de.campussource.cse.cdmm;
+
+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;
+
+@Entity
+@Embeddable
+@Table(name = "CDMM_ATTRIBUTE")
+public class Attribute {
+
+ private String name;
+
+ private String value;
+
+ @ManyToOne
+ @JoinColumn(name="ENTITY_ID")
+ private 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
+ @XmlIDREF
+ public Entity getEntity() {
+ return entity;
+ }
+
+
+ public void setEntity(Entity entity) {
+ this.entity = entity;
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Attribute.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,109 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+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.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Table(name = "CDMM_CATEGORY")
+@XmlType(name="Category")
+public class Category extends de.campussource.cse.cdmm.Entity {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @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() {
+ }
+
+ 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();
+ }
+
+ @XmlElement
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @XmlElement
+ public List<Category> getChildren() {
+ return children;
+ }
+
+ public void setChildren(List<Category> children) {
+ this.children = children;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Course> getCourses() {
+ return courses;
+ }
+
+ public void setCourses(List<Course> courses) {
+ this.courses = courses;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Category> getParents() {
+ return parents;
+ }
+
+ public void setParents(List<Category> parents) {
+ this.parents = parents;
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Category.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryDao.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,7 @@
+package de.campussource.cse.cdmm;
+
+import de.campussource.cse.cdmm.DAOJPA;
+
+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/CategoryDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,133 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+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.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Table(name = "CDMM_COURSE")
+public class Course extends de.campussource.cse.cdmm.Entity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @OneToMany(mappedBy="course")
+ private List<Account> members;
+
+ @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 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();
+ }
+
+ @XmlElement
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Account> getMembers() {
+ return members;
+ }
+
+ public void setMembers(List<Account> members) {
+ this.members = members;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public Course getParent() {
+ return parent;
+ }
+
+ public void setParent(Course parent) {
+ this.parent = parent;
+ }
+
+ @XmlElement
+ public List<Course> getWorkgroups() {
+ return workgroups;
+ }
+
+ public void setWorkgroups(List<Course> workgroups) {
+ this.workgroups = workgroups;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Category> getCategories() {
+ return categories;
+ }
+
+ public void setCategories(List<Category> categories) {
+ this.categories = categories;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Role> getRoles() {
+ return roles;
+ }
+
+ public void setRoles(List<Role> roles) {
+ this.roles = roles;
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Course.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseDao.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,6 @@
+package de.campussource.cse.cdmm;
+import de.campussource.cse.cdmm.DAOJPA;
+
+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/CourseDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,13 @@
+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);
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAO.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,42 @@
+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);
+ }
+
+
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DAOJPA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,8 @@
+package de.campussource.cse.cdmm;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface DataModelManager {
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,17 @@
+package de.campussource.cse.cdmm;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+
+@Stateless
+public class DataModelManagerBean implements DataModelManager {
+
+// @EJB
+// private ClientObjectDao objectDao;
+//
+// @EJB
+// private ClientInstanceDao instanceDao;
+
+
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,38 @@
+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.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public abstract class Entity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @OneToMany(mappedBy="entity")
+ private List<Attribute> attributes;
+
+ @XmlElement
+ public List<Attribute> getAttributes(){
+ return attributes;
+ }
+
+ public void setAttributes(List<Attribute> attributes) {
+ this.attributes = attributes;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ };
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Entity.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,74 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+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;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Table(name = "CDMM_GROUP")
+@XmlType(name="Group")
+public class Group extends Account{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @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();
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public List<Account> getMembers() {
+ return members;
+ }
+
+ public void setMembers(List<Account> members) {
+ this.members = members;
+ }
+
+ @XmlElement
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Group.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupDao.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,6 @@
+package de.campussource.cse.cdmm;
+import de.campussource.cse.cdmm.DAOJPA;
+
+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/GroupDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,101 @@
+package de.campussource.cse.cdmm;
+
+import javax.persistence.Column;
+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.XmlIDREF;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+@Entity
+@Table(name = "CDMM_ROLE")
+public class Role extends de.campussource.cse.cdmm.Entity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @Column(name="ROLE_TYPE")
+ private RoleType type;
+
+ @ManyToOne
+ @JoinColumn(name="ACCOUNT_ID")
+ private Account account;
+
+ @ManyToOne
+ @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;
+ }
+
+ public void setType(RoleType type) {
+ this.type = type;
+ }
+
+ @XmlElement
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public Account getAccount() {
+ return account;
+ }
+
+ public void setAccount(Account account) {
+ this.account = account;
+ }
+
+ @XmlElement
+ @XmlIDREF
+ public Course getCourse() {
+ return course;
+ }
+
+ public void setCourse(Course course) {
+ this.course = course;
+ }
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Role.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleDao.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,6 @@
+package de.campussource.cse.cdmm;
+import de.campussource.cse.cdmm.DAOJPA;
+
+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/RoleDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java 2009-03-02 14:49:04 UTC (rev 35)
@@ -0,0 +1,14 @@
+package de.campussource.cse.cdmm;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+@XmlEnum
+public enum RoleType{
+ @XmlEnumValue(value="0")
+ UNDEFINED,
+ @XmlEnumValue(value="1")
+ PARTICIPANT,
+ @XmlEnumValue(value="2")
+ ASSISTENT
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-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: <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-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.
|
×
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