Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[118] trunk/sandbox/cse-ip/sc-cdmm/src
|
From: <ro...@us...> - 2009-03-27 12:53:52
|
Revision: 118
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=118&view=rev
Author: roekens
Date: 2009-03-27 12:53:30 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
fixed xml type names
changed id name to busId
Modified Paths:
--------------
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -17,7 +17,7 @@
@Override
public Attribute unmarshal(Attribute v) throws Exception {
- if (!v.isPersistent()){
+ if (v.isTransient()){
return new TransientAttribute(v.getName(), v.getValue());
}
return new PersistentAttribute(v.getName(), v.getValue());
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -47,7 +47,7 @@
public static final String PROPERTY_COURSES = "courses";
public static final String PROPERTY_NAME = "name";
public static final String PROPERTY_VALUE = "value";
- public static final String PROPERTY_PERSISTENT = "peristent";
+ public static final String PROPERTY_TRANSIENT = "transient";
//table names
public static final String TABLENAME_ACCOUNT = "CDMM_ACCOUNT";
@@ -73,9 +73,17 @@
public static final String COLUMNNAME_ENTITY_ID = "ENTITY_ID";
- public static final String ID = "id";
+ public static final String ID = "busId";
+ public static final String ENTITY_TYPE = "entityType";
+ public static final String ACCOUNT_TYPE = "accountType";
+ public static final String CATEGORY_TYPE = "categoryType";
+ public static final String COURSE_TYPE = "courseType";
+ public static final String GROUP_TYPE = "groupType";
+ public static final String ATTRIBUTE_TYPE = "attributeType";
+ public static final String ROLE_TYPE = "roleType";
+ public static final String ENTITYCONTAINER_TYPE = "entityContainerType";
+ public static final String ROLE_TYPE_TYPE = "roleTypeType";
-
}
\ No newline at end of file
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -32,7 +32,7 @@
@Table(name = Constants.TABLENAME_ACCOUNT)
@Inheritance(strategy=InheritanceType.JOINED)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ACCOUNT_TYPE, propOrder={Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Account extends de.campussource.cse.cdmm.domain.Entity{
@OneToMany(mappedBy=Constants.ACCOUNT, cascade=CascadeType.REMOVE)
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -1,10 +1,9 @@
package de.campussource.cse.cdmm.domain;
import javax.persistence.Transient;
-import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import de.campussource.cse.cdmm.AttributeAdapter;
@@ -16,7 +15,7 @@
*
*/
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ATTRIBUTE_TYPE, namespace=Constants.NAMESPACE_DATATYPES)
@XmlJavaTypeAdapter(value=AttributeAdapter.class)
public class Attribute {
@@ -27,21 +26,21 @@
private String value;
- private boolean persistent;
+ private boolean trans;
public Attribute(){
}
- @XmlAttribute(name=Constants.PROPERTY_PERSISTENT)
- public boolean isPersistent() {
- return persistent;
+ @XmlElement(name=Constants.PROPERTY_TRANSIENT)
+ public boolean isTransient() {
+ return trans;
}
- public void setPersistent(boolean persistent) {
- this.persistent = persistent;
+ public void setTransient(boolean trans) {
+ this.trans = trans;
}
- @XmlAttribute(name=Constants.PROPERTY_NAME)
+ @XmlElement(name=Constants.PROPERTY_NAME)
public String getName() {
return name;
}
@@ -50,7 +49,7 @@
this.name = name;
}
- @XmlValue
+ @XmlElement(name=Constants.PROPERTY_VALUE)
public String getValue() {
return value;
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -30,7 +30,7 @@
@Inheritance(strategy=InheritanceType.JOINED)
@Table(name = Constants.TABLENAME_CATEGORY)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.PROPERTY_PARENT, Constants.PROPERTY_CHILDREN, Constants.PROPERTY_COURSES}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.CATEGORY_TYPE, propOrder={Constants.PROPERTY_PARENT, Constants.PROPERTY_CHILDREN, Constants.PROPERTY_COURSES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Category extends de.campussource.cse.cdmm.domain.Entity {
@ManyToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -33,7 +33,7 @@
@Table(name = Constants.TABLENAME_COURSE)
@Inheritance(strategy=InheritanceType.JOINED)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.COURSE_TYPE, propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Course extends de.campussource.cse.cdmm.domain.Entity{
@ManyToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -33,7 +33,7 @@
@Table(name = Constants.TABLENAME_ENTITY)
@Inheritance(strategy=InheritanceType.JOINED)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.ID, Constants.PROPERTY_ATTRIBUTES}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ENTITY_TYPE,propOrder={"id", Constants.PROPERTY_ATTRIBUTES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@Id
@@ -107,7 +107,7 @@
public void setAttributes(List<Attribute> attributes) {
List<Attribute> newAttributeList = new ArrayList<Attribute>();
for (Attribute att : attributes){
- if (att.isPersistent()){
+ if (!att.isTransient()){
newAttributeList.add(attribute2PersistentAttribute(att));
} else{
newAttributeList.add(attribute2TransientAttribute(att));
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -20,7 +20,7 @@
*
*/
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ENTITYCONTAINER_TYPE, namespace=Constants.NAMESPACE_DATATYPES)
public class EntityContainer{
private Category rootCategory;
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -28,7 +28,7 @@
@Table(name = Constants.TABLENAME_GROUP)
@Inheritance(strategy=InheritanceType.JOINED)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.GROUP_TYPE, propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES)
public class Group extends Account{
@ManyToMany(mappedBy=Constants.GROUPS, cascade={CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -59,7 +59,7 @@
public PersistentAttribute(String name, String value){
setName(name);
setValue(value);
- setPersistent(true);
+ setTransient(false);
}
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -35,7 +35,7 @@
name = "Role.findByAccountAndCourse",
query = "select r from role r where r.account.id=:accountId and r.course.id = :courseId")})
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ROLE_TYPE, propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES)
public class Role extends de.campussource.cse.cdmm.domain.Entity{
@Column(name=Constants.COLUMNNAME_ROLE_TYPE, nullable=false, insertable=true, updatable=true)
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -16,7 +16,7 @@
*
*/
@XmlEnum
-@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+@XmlType(name=Constants.ROLE_TYPE_TYPE, namespace=Constants.NAMESPACE_DATATYPES)
public enum RoleType{
@XmlEnumValue(value="UNDEFINED")
UNDEFINED,
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -14,6 +14,6 @@
public TransientAttribute(String name, String value){
setName(name);
setValue(value);
- setPersistent(false);
+ setTransient(true);
}
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -78,9 +78,9 @@
assertNotNull(entity.hashCode());
entity = new Entity(1L);
Attribute att1 = new Attribute();
- att1.setPersistent(true);
+ att1.setTransient(false);
Attribute att2 = new Attribute();
- att2.setPersistent(false);
+ att2.setTransient(true);
List<Attribute> attribs = new ArrayList<Attribute>();
attribs.add(att1); attribs.add(att2);
entity.setAttributes(attribs);
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-26 12:06:08 UTC (rev 117)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-27 12:53:30 UTC (rev 118)
@@ -469,7 +469,27 @@
}
assertTrue(category.equals(convertedCategory));
System.out.println("----- leaving Attribute XML Test -----");
-
}
+ @Test
+ public void testUnmarshalling(){
+ String courseXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
+"<tns:course xmlns:tns=\"http://cse.campussource.de/DataTypes\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"+
+ "<id>1</id>"+
+ "<categories>"+
+ "<category>"+
+ "<id>ID_2</id>"+
+ "</category>"+
+ "</categories>"+
+"</tns:course>";
+ try {
+ JAXBContext context = JAXBContext.newInstance(Category.class, Attribute.class, PersistentAttribute.class, TransientAttribute.class);
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ Course convertedCourse = (Course) unmarshaller.unmarshal(new StringReader(courseXml));
+ System.out.println(convertedCourse.toString());
+ } catch (JAXBException e) {
+ fail(e.getMessage());
+ }
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
