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. |