Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[50] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src
|
From: <ro...@us...> - 2009-03-04 12:48:32
|
Revision: 50
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=50&view=rev
Author: roekens
Date: 2009-03-04 12:48:28 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
- removed attributes definition <- attributes are getting realized in a different way
- introduced constants class to prevent repetetive string definitions in java classes
- introduced namespaces for xml
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
Removed Paths:
-------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -0,0 +1,5 @@
+package de.campussource.cse.cdmm;
+
+public class Constants{
+ public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes";
+}
\ No newline at end of file
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AttributeDao.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,7 +0,0 @@
-package de.campussource.cse.cdmm.dao;
-import de.campussource.cse.cdmm.dao.DAOJPA;
-import de.campussource.cse.cdmm.domain.Attribute;
-
-public class AttributeDao extends DAOJPA<Attribute> {
-
-}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_ACCOUNT")
@XmlRootElement
-@XmlType(propOrder={ "groups", "roles"})
+@XmlType(propOrder={ "groups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Account extends de.campussource.cse.cdmm.domain.Entity{
@OneToMany(mappedBy="account")
Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,83 +0,0 @@
-package de.campussource.cse.cdmm.domain;
-
-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.domain.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.domain.Entity getEntity() {
- return entity;
- }
-
-
- public void setEntity(de.campussource.cse.cdmm.domain.Entity entity) {
- this.entity = entity;
- }
-
- @XmlTransient
- 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/domain/Category.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_CATEGORY")
@XmlRootElement
-@XmlType(propOrder={ "parents", "children", "courses"})
+@XmlType(propOrder={ "parents", "children", "courses"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Category extends de.campussource.cse.cdmm.domain.Entity {
@ManyToMany
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -19,11 +19,13 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_COURSE")
@XmlRootElement
-@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"})
+@XmlType(propOrder={ "categories", "parent", "workgroups", "roles"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Course extends de.campussource.cse.cdmm.domain.Entity{
@ManyToOne
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -1,43 +1,29 @@
package de.campussource.cse.cdmm.domain;
-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;
+import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.IdAdapter;
@XmlRootElement
-@XmlType(propOrder={"id","attributes"})
+@XmlType(propOrder={"id"}, namespace=Constants.NAMESPACE_DATATYPES)
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(){
}
@@ -71,10 +57,6 @@
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;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -7,21 +7,21 @@
import javax.xml.bind.annotation.XmlElements;
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;
+import de.campussource.cse.cdmm.Constants;
+
@XmlRootElement
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
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;
@@ -42,10 +42,6 @@
this.entities = entities;
}
- public void setAttributes(List<Attribute> attributes) {
- this.attributes = attributes;
- }
-
public void setCategories(List<Category> categories) {
this.categories = categories;
}
@@ -68,11 +64,6 @@
}
@XmlTransient
- public List<Attribute> getAttributes() {
- return attributes;
- }
-
- @XmlTransient
public List<Category> getCategories() {
return categories;
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -15,11 +15,13 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import de.campussource.cse.cdmm.Constants;
+
@Entity
@Embeddable
@Table(name = "CDMM_GROUP")
@XmlRootElement
-@XmlType(propOrder={"members"})
+@XmlType(propOrder={"members"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Group extends Account{
@ManyToMany(mappedBy="groups")
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -11,13 +11,14 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.RoleType;
@Entity
@Embeddable
@Table(name = "CDMM_ROLE")
@XmlRootElement
-@XmlType(propOrder={"type", "account", "course"})
+@XmlType(propOrder={"type", "account", "course"}, namespace=Constants.NAMESPACE_DATATYPES)
public class Role extends de.campussource.cse.cdmm.domain.Entity{
@Column(name="ROLE_TYPE")
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-04 12:25:48 UTC (rev 49)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-04 12:48:28 UTC (rev 50)
@@ -21,7 +21,6 @@
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
import de.campussource.cse.cdmm.domain.Account;
-import de.campussource.cse.cdmm.domain.Attribute;
import de.campussource.cse.cdmm.domain.Category;
import de.campussource.cse.cdmm.domain.Course;
import de.campussource.cse.cdmm.domain.EntityContainer;
@@ -49,6 +48,7 @@
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
} catch (JAXBException e) {
+ e.printStackTrace();
fail(e.getMessage());
}
@@ -134,14 +134,6 @@
Group group = new Group();
group.setId(createUniqueId());
- Attribute att = new Attribute();
- att.setName("testName");
- att.setValue("testValue");
- List<Attribute> atts = new ArrayList<Attribute>();
- atts.add(att);
-
- group.setAttributes(atts);
-
List<Group> groups = new ArrayList<Group>();
groups.add(group);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
