[Cse-ip-svn-commits] SF.net SVN: cse-ip:[71] cse-ip/trunk/sandbox/cse-ip

[<ro...@us...>]

Revision: 71
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=71&view=rev
Author:   roekens
Date:     2009-03-10 11:06:21 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
- updated poms, so that sc-cdmm now is generated with main project correctly
- introduced cascading for course objetc -> to be tested

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml
    cse-ip/trunk/sandbox/cse-ip/pom.xml
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java

Modified: cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml	2009-03-10 10:41:52 UTC (rev 70)
+++ cse-ip/trunk/sandbox/cse-ip/cse-ip-application/pom.xml	2009-03-10 11:06:21 UTC (rev 71)
@@ -21,6 +21,12 @@
 			<version>${pom.version}</version>
 			<type>ejb</type>
 		</dependency>
+		<dependency>
+			<groupId>de.campussource.cse</groupId>
+			<artifactId>sc-cdmm</artifactId>
+			<version>${pom.version}</version>
+			<type>ejb</type>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -37,6 +43,12 @@
 							<artifactId>sc-idmapper</artifactId>
 						</ejbModule>
 					</modules>
+					<modules>
+						<ejbModule>
+							<groupId>de.campussource.cse</groupId>
+							<artifactId>sc-cdmm</artifactId>
+						</ejbModule>
+					</modules>
 				</configuration>
 			</plugin>
 			<plugin>

Modified: cse-ip/trunk/sandbox/cse-ip/pom.xml
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/pom.xml	2009-03-10 10:41:52 UTC (rev 70)
+++ cse-ip/trunk/sandbox/cse-ip/pom.xml	2009-03-10 11:06:21 UTC (rev 71)
@@ -50,6 +50,7 @@
         <module>framework</module>
 		<module>ica-his-lsf</module>
 		<module>sc-idmapper</module>
+		<module>sc-cdmm</module>
 		<module>cse-ip-application</module>
 	</modules>
 	

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-10 10:41:52 UTC (rev 70)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java	2009-03-10 11:06:21 UTC (rev 71)
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
@@ -29,21 +30,21 @@
 @XmlType(propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES)
 public class Course extends de.campussource.cse.cdmm.domain.Entity{
 	
-	@ManyToOne
+	@ManyToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
 	@JoinTable(name=Constants.COLUMNNAME_PARENT_ID)
 	private Course parent;
 	
-	@OneToMany(mappedBy=Constants.PARENT)
+	@OneToMany(mappedBy=Constants.PARENT, cascade=CascadeType.REMOVE)
 	private List<Course> workgroups;
 	
-	@ManyToMany
+	@ManyToMany(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
 	@JoinTable(
 			name = Constants.TABLENAME_COURSE2CATEGORY,
 			joinColumns={@JoinColumn(name=Constants.COLUMNNAME_CATEGORY_ID)},
 			inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_COURSE_ID)})
 	private List<Category> categories;
 	
-	@OneToMany(mappedBy=Constants.COURSE)
+	@OneToMany(mappedBy=Constants.COURSE, cascade = CascadeType.REMOVE)
 	private List<Role> roles;
 	
 	public Course(){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.