[Cse-ip-svn-commits] SF.net SVN: cse-ip:[56] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src

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

Revision: 56
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=56&view=rev
Author:   roekens
Date:     2009-03-05 13:09:43 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
- moved RoleType to domain package and fixed xml namespace
- enhanced test output of xml schemas

Modified Paths:
--------------
    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/domain/RoleType.java

Removed Paths:
-------------
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java

Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java	2009-03-05 12:56:15 UTC (rev 55)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java	2009-03-05 13:09:43 UTC (rev 56)
@@ -1,14 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-
-@XmlEnum
-public enum RoleType{
-	@XmlEnumValue(value="UNDEFINED")
-	UNDEFINED,
-	@XmlEnumValue(value="PARTICIPANT")
-	PARTICIPANT,
-	@XmlEnumValue(value="ASSISTANT")
-	ASSISTANT
-}
\ No newline at end of file

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-05 12:56:15 UTC (rev 55)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java	2009-03-05 13:09:43 UTC (rev 56)
@@ -12,7 +12,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.RoleType;
+import de.campussource.cse.cdmm.domain.RoleType;
 
 @Entity
 @Embeddable

Copied: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java (from rev 44, cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleType.java)
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java	                        (rev 0)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java	2009-03-05 13:09:43 UTC (rev 56)
@@ -0,0 +1,18 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+import de.campussource.cse.cdmm.Constants;
+
+@XmlEnum
+@XmlType(namespace=Constants.NAMESPACE_DATATYPES)
+public enum RoleType{
+	@XmlEnumValue(value="UNDEFINED")
+	UNDEFINED,
+	@XmlEnumValue(value="PARTICIPANT")
+	PARTICIPANT,
+	@XmlEnumValue(value="ASSISTANT")
+	ASSISTANT
+}
\ No newline at end of file


Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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-05 12:56:15 UTC (rev 55)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java	2009-03-05 13:09:43 UTC (rev 56)
@@ -27,6 +27,7 @@
 import de.campussource.cse.cdmm.domain.EntityContainer;
 import de.campussource.cse.cdmm.domain.Group;
 import de.campussource.cse.cdmm.domain.Role;
+import de.campussource.cse.cdmm.domain.RoleType;
 
 import junit.framework.TestCase;
  
@@ -300,7 +301,7 @@
 		Marshaller marshaller=null;
 		JAXBContext context=null;
 		try {
-			context = JAXBContext.newInstance(EntityContainer.class);
+			context = JAXBContext.newInstance(new Class[]{EntityContainer.class, Account.class, Group.class, Role.class, Course.class, Category.class});
 			marshaller = context.createMarshaller();
 			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
 		} catch (JAXBException e) {
@@ -321,7 +322,10 @@
 							return result;      
 						} 
 					});
-			printDOMResult(results.get(0));
+			for (DOMResult result : results){
+				System.out.println("----- Generated XML Schema: ");
+				printDOMResult(result);
+			}
 		} catch (IOException e) {
 			e.printStackTrace();
 			fail(e.getMessage());


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