You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/04 17:46:20 UTC
svn commit: r1227221 - in /camel/branches/camel-2.9.x: ./
components/camel-http/
components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
parent/pom.xml
Author: davsclaus
Date: Wed Jan 4 16:46:20 2012
New Revision: 1227221
URL: http://svn.apache.org/viewvc?rev=1227221&view=rev
Log:
CAMEL-4860: Upgraded to tagsoup 1.2.1. Thanks to Babak for the patch.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
camel/branches/camel-2.9.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
camel/branches/camel-2.9.x/parent/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 16:46:20 2012
@@ -1 +1 @@
-/camel/trunk:1227209
+/camel/trunk:1227209,1227212
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 4 16:46:20 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209
+/camel/trunk:1-1227196,1227209,1227212
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 4 16:46:20 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209
+/camel/trunk/components/camel-http:917526,1227209,1227212
Modified: camel/branches/camel-2.9.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java?rev=1227221&r1=1227220&r2=1227221&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java (original)
+++ camel/branches/camel-2.9.x/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java Wed Jan 4 16:46:20 2012
@@ -74,7 +74,7 @@ public class TidyMarkupDataFormat implem
/**
* String or Node to return
*/
- private Class dataObjectType;
+ private Class<?> dataObjectType;
/**
* What is the default output format ?
@@ -117,7 +117,6 @@ public class TidyMarkupDataFormat implem
*
* @throws Exception
*/
- @SuppressWarnings("unchecked")
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
ObjectHelper.notNull(dataObjectType, "dataObjectType", this);
@@ -317,7 +316,7 @@ public class TidyMarkupDataFormat implem
/**
* @return the dataObjectType
*/
- public Class getDataObjectType() {
+ public Class<?> getDataObjectType() {
return dataObjectType;
}
@@ -325,7 +324,7 @@ public class TidyMarkupDataFormat implem
* @param dataObjectType
* the dataObjectType to set
*/
- public void setDataObjectType(Class dataObjectType) {
+ public void setDataObjectType(Class<?> dataObjectType) {
this.dataObjectType = dataObjectType;
}
Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1227221&r1=1227220&r2=1227221&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jan 4 16:46:20 2012
@@ -154,7 +154,7 @@
<spymemcached-version>2.5</spymemcached-version>
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>3.0</stringtemplate-version>
- <tagsoup-version>1.2</tagsoup-version>
+ <tagsoup-version>1.2.1</tagsoup-version>
<testng-version>6.0.1</testng-version>
<velocity-version>1.7</velocity-version>
<woodstox-version>4.1.1</woodstox-version>