Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[63] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src
|
From: <ro...@us...> - 2009-03-06 14:24:04
|
Revision: 63
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=63&view=rev
Author: roekens
Date: 2009-03-06 14:23:49 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
introduction of persistence realisation
Modified Paths:
--------------
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/domain/Account.java
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/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/Group.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.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/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
Added Paths:
-----------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
Modified: 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 2009-03-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -3,15 +3,27 @@
import javax.ejb.EJB;
import javax.ejb.Stateless;
+import de.campussource.cse.cdmm.dao.*;
+
@Stateless
public class DataModelManagerBean implements DataModelManager {
-// @EJB
-// private ClientObjectDao objectDao;
-//
-// @EJB
-// private ClientInstanceDao instanceDao;
-
+ @EJB
+ private AccountDao accountDao;
+ @EJB
+ private CategoryDao categoryDao;
+ @EJB
+ private CourseDao courseDao;
+
+ @EJB
+ private EntityDao entityDao;
+
+ @EJB
+ private GroupDao groupDao;
+
+ @EJB
+ private RoleDao roleDao;
+
}
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -2,7 +2,6 @@
import java.util.List;
-import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -18,7 +17,6 @@
import de.campussource.cse.cdmm.Constants;
@Entity
-@Embeddable
@Table(name = Constants.TABLENAME_ACCOUNT)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={ Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
Modified: 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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -1,6 +1,5 @@
package de.campussource.cse.cdmm.domain;
-import javax.persistence.Embeddable;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -9,7 +8,6 @@
import de.campussource.cse.cdmm.Constants;
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@Embeddable
@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class Attribute {
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -2,7 +2,6 @@
import java.util.List;
-import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -18,7 +17,6 @@
import de.campussource.cse.cdmm.Constants;
@Entity
-@Embeddable
@Table(name = Constants.TABLENAME_CATEGORY)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.PROPERTY_PARENTS, Constants.PROPERTY_CHILDREN, Constants.PROPERTY_COURSES}, namespace=Constants.NAMESPACE_DATATYPES)
@@ -31,7 +29,7 @@
inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_PARENT_ID)})
private List<Category> parents;
- @ManyToMany(mappedBy=Constants.PARENT)
+ @ManyToMany(mappedBy=Constants.PARENTS)
private List<Category> children;
@ManyToMany(mappedBy=Constants.CATEGORIES)
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -2,7 +2,6 @@
import java.util.List;
-import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -22,7 +21,6 @@
import de.campussource.cse.cdmm.Constants;
@Entity
-@Embeddable
@Table(name = Constants.TABLENAME_COURSE)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -7,6 +7,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
@@ -21,6 +22,7 @@
import de.campussource.cse.cdmm.Constants;
import de.campussource.cse.cdmm.IdAdapter;
+@javax.persistence.Entity
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.ID, Constants.PROPERTY_ATTRIBUTES}, namespace=Constants.NAMESPACE_DATATYPES)
public class Entity{
@@ -29,6 +31,7 @@
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
+ @Transient
private List<Attribute> attributes;
public Entity(){
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -2,7 +2,6 @@
import java.util.List;
-import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
@@ -18,7 +17,6 @@
import de.campussource.cse.cdmm.Constants;
@Entity
-@Embeddable
@Table(name = Constants.TABLENAME_GROUP)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES)
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -1,13 +1,11 @@
package de.campussource.cse.cdmm.domain;
-import javax.persistence.Embeddable;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import de.campussource.cse.cdmm.Constants;
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@Embeddable
@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class PersistentAttribute extends Attribute {
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-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -1,7 +1,6 @@
package de.campussource.cse.cdmm.domain;
import javax.persistence.Column;
-import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -15,7 +14,6 @@
import de.campussource.cse.cdmm.domain.RoleType;
@Entity
-@Embeddable
@Table(name = Constants.TABLENAME_ROLE)
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
@XmlType(propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES)
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-06 13:29:28 UTC (rev 62)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -1,13 +1,11 @@
package de.campussource.cse.cdmm.domain;
-import javax.persistence.Embeddable;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import de.campussource.cse.cdmm.Constants;
@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@Embeddable
@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
public class TransientAttribute extends Attribute {
public TransientAttribute(){}
Added: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-03-06 14:23:49 UTC (rev 63)
@@ -0,0 +1,11 @@
+package de.campussource.cse.cdmm;
+
+import org.junit.Test;
+
+public class CategoryDaoTest extends AbstractPersistentUnitTest{
+
+ @Test
+ public void testXYZ(){
+ }
+
+}
Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.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.
|
