Author: ningjiang
Date: Thu Nov 6 07:20:20 2008
New Revision: 711876
URL: http://svn.apache.org/viewvc?rev=711876&view=rev
Log:
Merged revisions 711874 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r711874 | ningjiang | 2008-11-06 23:13:48 +0800 (Thu, 06 Nov 2008) | 1 line
CAMEL-822 updated the jaxb.index file of dataformat
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 6 07:20:20 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 6 07:20:20 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,711859
+/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,711874
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index?rev=711876&r1=711875&r2=711876&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
Thu Nov 6 07:20:20 2008
@@ -21,6 +21,7 @@
DataFormatType
DataFormatsType
JaxbDataFormat
+JsonDataFormat
SerializationDataFormat
StringDataFormat
XMLBeansDataFormat
