camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r726339 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
Date Sun, 14 Dec 2008 02:44:08 GMT
Author: ningjiang
Date: Sat Dec 13 18:44:07 2008
New Revision: 726339

URL: http://svn.apache.org/viewvc?rev=726339&view=rev
Log:
CAMEL-1184 fixed the build error

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
    activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java?rev=726339&r1=726338&r2=726339&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
Sat Dec 13 18:44:07 2008
@@ -40,8 +40,7 @@
     // @XmlElementRef
     @XmlElements({
         @XmlElement(required = false, name = "artixDS", type = ArtixDSDataFormat.class),
-        @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
-        @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
+        @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),        
         @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
         @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
         @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),

Modified: activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java?rev=726339&r1=726338&r2=726339&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
(original)
+++ activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
Sat Dec 13 18:44:07 2008
@@ -52,6 +52,7 @@
         template.sendBody("direct:in", order);
 
         mock.assertIsSatisfied();
+       
 
         String body1 = mock.getExchanges().get(0).getIn().getBody(String.class);
         String body2 = mock.getExchanges().get(1).getIn().getBody(String.class);



Mime
View raw message