Author: davsclaus
Date: Sun Aug 31 06:41:21 2008
New Revision: 690692
URL: http://svn.apache.org/viewvc?rev=690692&view=rev
Log:
CAMEL-616: Flatpack dataformat registered
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
- copied, changed from r690664,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=690692&r1=690691&r2=690692&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
Sun Aug 31 06:41:21 2008
@@ -27,6 +27,7 @@
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -52,6 +53,7 @@
@XmlElements({
@XmlElement(required = false, name = "artixDS", type =
ArtixDSDataFormat.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),
@XmlElement(required = false, name = "serialization", type =
SerializationDataFormat.class),
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=690692&r1=690691&r2=690692&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
Sun Aug 31 06:41:21 2008
@@ -27,6 +27,7 @@
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -52,6 +53,7 @@
@XmlElements({
@XmlElement(required = false, name = "artixDS", type =
ArtixDSDataFormat.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),
@XmlElement(required = false, name = "serialization", type =
SerializationDataFormat.class),
Copied:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
(from r690664,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java&r1=690664&r2=690692&rev=690692&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
Sun Aug 31 06:41:21 2008
@@ -23,17 +23,17 @@
import org.apache.camel.spi.DataFormat;
/**
- * Represents a HL7 [EMAIL PROTECTED] org.apache.camel.spi.DataFormat}.
+ * Represents a Flatpack [EMAIL PROTECTED] org.apache.camel.spi.DataFormat}.
*
- * @see <a href="http://activemq.apache.org/camel/hl7.html">HL7
documentation</a>.
+ * @see <a href="http://activemq.apache.org/camel/flatpack.html">Flatpack
documentation</a>.
* @version $Revision$
*/
[EMAIL PROTECTED](name = "hl7")
[EMAIL PROTECTED](name = "flatpack")
@XmlAccessorType(XmlAccessType.FIELD)
-public class HL7DataFormat extends DataFormatType {
+public class FlatpackDataFormat extends DataFormatType {
- public HL7DataFormat() {
- super("org.apache.camel.dataformat.hl7.HL7DataFormat");
+ public FlatpackDataFormat() {
+ super("org.apache.camel.component.flatpack.FlatpackDataFormat");
}
}
\ No newline at end of file
Modified:
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java?rev=690692&r1=690691&r2=690692&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
(original)
+++
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
Sun Aug 31 06:41:21 2008
@@ -40,9 +40,10 @@
* <p/>
* This data format supports two operations:
* <ul>
- * <li>marshal = from <tt>List<Map<String, Object>></tt> to
<tt>OutputStream</tt> (convertable to String)</li>
+ * <li>marshal = from <tt>List<Map<String, Object>></tt> to
<tt>OutputStream</tt> (can be converted to String)</li>
* <li>unmarshal = from <tt>InputStream</tt> (such as a File) to [EMAIL
PROTECTED] DataSetList}.
* </ul>
+ * <b>Notice:</b> The Flatpack library does currenntly not support header and
trailers for the marshal operation.
*
* @version $Revision$
*/