Author: ningjiang
Date: Thu Nov 6 06:47:38 2008
New Revision: 711862
URL: http://svn.apache.org/viewvc?rev=711862&view=rev
Log:
Merged revisions 711859 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r711859 | ningjiang | 2008-11-06 22:10:23 +0800 (Thu, 06 Nov 2008) | 1 line
CAMEL-822 a quick fix of jaxb.index and javadoc issues
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 6 06:47:38 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 6 06:47:38 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java?rev=711862&r1=711861&r2=711862&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
Thu Nov 6 06:47:38 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/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java?rev=711862&r1=711861&r2=711862&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
Thu Nov 6 06:47:38 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>
+ * ([EMAIL PROTECTED] 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/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java?rev=711862&r1=711861&r2=711862&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
Thu Nov 6 06:47:38 2008
@@ -36,7 +36,7 @@
/**
* A <a href="http://activemq.apache.org/camel/data-format.html";>data
format</a>
- * ([EMAIL PROTECTED] DataFormat}) using XmlBeans to marshal to and from XML
+ * ([EMAIL PROTECTED] DataFormat}) using XStream and Jettison to marshal to
and from JSON
*
* @version $Revision$
*/
Modified:
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java?rev=711862&r1=711861&r2=711862&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
Thu Nov 6 06:47:38 2008
@@ -37,7 +37,7 @@
/**
* A <a href="http://activemq.apache.org/camel/data-format.html";>data
format</a>
- * ([EMAIL PROTECTED] DataFormat}) using XmlBeans to marshal to and from XML
+ * ([EMAIL PROTECTED] DataFormat}) using XStream to marshal to and from XML
*
* @version $Revision$
*/
