svn commit: r664343 - in /activemq/camel/trunk/components/camel-jaxb/src: main/java/org/apache/camel/converter/jaxb/MessageType.java test/java/org/apache/camel/jaxb/DumpToXmlTest.java

[davsclaus]

Author: davsclaus
Date: Sat Jun  7 07:24:12 2008
New Revision: 664343

URL: http://svn.apache.org/viewvc?rev=664343&view=rev
Log:
CAMEL-583: Lessened the header type to let the JAXB stuff work and improved the 
unit test a bit - Added javadoc that MessageType is work in progress

Modified:
    
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
    
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java

Modified: 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java?rev=664343&r1=664342&r2=664343&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
 (original)
+++ 
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
 Sat Jun  7 07:24:12 2008
@@ -33,14 +33,17 @@
 import org.apache.camel.Message;
 
 /**
- * Represents a JAXB2 representation of a Camel [EMAIL PROTECTED] Message}
+ * Represents a JAXB2 representation of a Camel [EMAIL PROTECTED] Message} - 
<b>Important</b>: work in progress!
  *
  * @version $Revision$
  */
 @XmlRootElement(name = "message")
 @XmlAccessorType(value = XmlAccessType.FIELD)
 public class MessageType {
-    @XmlElementRef(type = HeaderType.class)
+    // TODO: XmlElementRef to the abstrac class HeaderType does not work 
(CAMEL-583)
+    //@XmlElementRef(type = HeaderType.class)
+    @XmlAnyElement(lax = true)
+    @XmlMixed
     List<HeaderType> headers = new ArrayList<HeaderType>();
     @XmlAnyElement(lax = true)
     @XmlMixed

Modified: 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java?rev=664343&r1=664342&r2=664343&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java
 (original)
+++ 
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java
 Sat Jun  7 07:24:12 2008
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.jaxb;
 
+import java.io.File;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxb.MessageType;
@@ -25,8 +27,12 @@
  */
 public class DumpToXmlTest extends ContextTestSupport {
     public void testDumplFilesToJaxb() throws Exception {
-        // TODO: Needs assertions, fails see CAMEL-583
-        Thread.sleep(5000);
+        deleteDirectory("target/camel/dump");
+        Thread.sleep(2000);
+
+        File file = new File("target/camel/dump");
+        assertTrue("The dump folder should exists", file.exists());
+        assertEquals("There should be 2 dumped files", 2, file.list().length);
     }
 
     @Override