You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/12/18 04:14:38 UTC
svn commit: r727622 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/dataformat/
camel-core/src/main/resource...
Author: ningjiang
Date: Wed Dec 17 19:14:37 2008
New Revision: 727622
URL: http://svn.apache.org/viewvc?rev=727622&view=rev
Log:
Merged revisions 725715 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r725715 | janstey | 2008-12-11 23:42:19 +0800 (Thu, 11 Dec 2008) | 5 lines
CAMEL-1184 - Add tidyMarkup dataformat for unmarshaling bad HTML into good (XML) HTML.
Thanks to Ramon Buckland for this!
........
Added:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
- copied unchanged from r725715, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml
- copied, changed from r725715, activemq/camel/trunk/components/camel-tagsoup/pom.xml
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/apache/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/apache/camel/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/resources/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/resources/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/resources/META-INF/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/resources/META-INF/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/resources/META-INF/LICENSE.txt
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/main/resources/META-INF/NOTICE.txt
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatWithUnmarshalTypeTest.java
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatWithUnmarshalTypeTest.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/log4j.properties
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/log4j.properties
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/camel/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/camel/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/
- copied from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/testfile1.html
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/testfile1.html
activemq/camel/branches/camel-1.x/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/testfile2-evilHtml.html
- copied unchanged from r725715, activemq/camel/trunk/components/camel-tagsoup/src/test/resources/org/apache/camel/dataformat/tagsoup/testfile2-evilHtml.html
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
activemq/camel/branches/camel-1.x/components/pom.xml
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 19:14:37 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,726640-726645,726932,727113,727375,727377
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,726640-726645,726932,727113,727375,727377
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=727622&r1=727621&r2=727622&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Wed Dec 17 19:14:37 2008
@@ -18,7 +18,6 @@
import java.util.zip.Deflater;
-import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.dataformat.ArtixDSContentType;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
@@ -29,6 +28,7 @@
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
+import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
@@ -155,6 +155,23 @@
}
/**
+ * Return WellFormed HTML (an XML Document) either
+ * {@link java.lang.String} or {@link org.w3c.dom.Node}
+ */
+ public T tidyMarkup(Class<?> dataObjectType) {
+ return dataFormat(new TidyMarkupDataFormat(dataObjectType));
+ }
+
+ /**
+ * Return TidyMarkup HTML DataFormat (an XML Document) either
+ * as {@link org.w3c.dom.Node}
+ */
+ public T tidyMarkup() {
+ return dataFormat(new TidyMarkupDataFormat(String.class));
+ }
+
+
+ /**
* Uses the XStream data format
*/
public T xstream() {
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=727622&r1=727621&r2=727622&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/MarshalType.java Wed Dec 17 19:14:37 2008
@@ -58,7 +58,7 @@
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
- @XmlElement(required = false, name = "string", type = StringDataFormat.class),
+ @XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=727622&r1=727621&r2=727622&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java Wed Dec 17 19:14:37 2008
@@ -32,6 +32,7 @@
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
+import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
@@ -59,6 +60,7 @@
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
+ @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
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=727622&r1=727621&r2=727622&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 Wed Dec 17 19:14:37 2008
@@ -47,6 +47,7 @@
@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 = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
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=727622&r1=727621&r2=727622&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 Wed Dec 17 19:14:37 2008
@@ -24,6 +24,7 @@
JsonDataFormat
SerializationDataFormat
StringDataFormat
+TidyMarkupDataFormat
XMLBeansDataFormat
XStreamDataFormat
-ZipDataFormat
\ No newline at end of file
+ZipDataFormat
Copied: activemq/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml (from r725715, activemq/camel/trunk/components/camel-tagsoup/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml?p2=activemq/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml&p1=activemq/camel/trunk/components/camel-tagsoup/pom.xml&r1=725715&r2=727622&rev=727622&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-tagsoup/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml Wed Dec 17 19:14:37 2008
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>camel-tagsoup</artifactId>
Modified: activemq/camel/branches/camel-1.x/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/pom.xml?rev=727622&r1=727621&r2=727622&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/pom.xml Wed Dec 17 19:14:37 2008
@@ -87,5 +87,6 @@
<module>camel-xmlbeans</module>
<module>camel-xmpp</module>
<module>camel-xstream</module>
+ <module>camel-tagsoup</module>
</modules>
</project>
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=727622&r1=727621&r2=727622&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Wed Dec 17 19:14:37 2008
@@ -432,6 +432,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-tagsoup</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-testng</artifactId>
<version>${project.version}</version>
</dependency>
@@ -928,6 +933,13 @@
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.ccil.cowan.tagsoup</groupId>
+ <artifactId>tagsoup</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>