svn commit: r711859 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/

[ni...@apache.org]

Author: ningjiang
Date: Thu Nov  6 06:10:23 2008
New Revision: 711859

URL: http://svn.apache.org/viewvc?rev=711859&view=rev
Log:
CAMEL-822 a quick fix of jaxb.index and javadoc issues

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
    activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
    activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
    activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.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=711859&r1=711858&r2=711859&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 Thu Nov  6 06:10:23 2008
@@ -44,6 +44,7 @@
         @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
         @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
         @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
+        @XmlElement(required = false, name = "json", type = JsonDataFormat.class),
         @XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
         @XmlElement(required = false, name = "string", type = StringDataFormat.class),
         @XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),

Modified: activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java?rev=711859&r1=711858&r2=711859&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java (original)
+++ activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java Thu Nov  6 06:10:23 2008
@@ -29,6 +29,13 @@
 import org.apache.camel.converter.jaxp.StaxConverter;
 import org.apache.camel.spi.DataFormat;
 
+/**
+ * An abstract class which implement <a href="http://activemq.apache.org/camel/data-format.html">data format</a>
+ * ({@link DataFormat}) interface which leverage the XStream library for XML or JSON's marshaling and unmarshaling
+ *
+ * @version $Revision$
+ */
+
 public abstract class AbstractXStreamWrapper implements DataFormat {
     
     private XStream xstream;

Modified: activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java?rev=711859&r1=711858&r2=711859&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java (original)
+++ activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java Thu Nov  6 06:10:23 2008
@@ -36,7 +36,7 @@
 
 /**
  * A <a href="http://activemq.apache.org/camel/data-format.html">data format</a>
- * ({@link DataFormat}) using XmlBeans to marshal to and from XML
+ * ({@link DataFormat}) using XStream and Jettison to marshal to and from JSON
  *
  * @version $Revision$
  */

Modified: activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java?rev=711859&r1=711858&r2=711859&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java (original)
+++ activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java Thu Nov  6 06:10:23 2008
@@ -37,7 +37,7 @@
 
 /**
  * A <a href="http://activemq.apache.org/camel/data-format.html">data format</a>
- * ({@link DataFormat}) using XmlBeans to marshal to and from XML
+ * ({@link DataFormat}) using XStream to marshal to and from XML
  *
  * @version $Revision$
  */