svn commit: r1057758 - in /camel/trunk: components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java

[ha...@apache.org]

Author: hadrian
Date: Tue Jan 11 17:40:45 2011
New Revision: 1057758

URL: http://svn.apache.org/viewvc?rev=1057758&view=rev
Log:
CAMEL-3528. Patch applied with thanks to Dan Kulp

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
    camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java?rev=1057758&r1=1057757&r2=1057758&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java Tue Jan 11 17:40:45 2011
@@ -39,27 +39,17 @@ import org.apache.cxf.jaxb.JAXBDataBindi
  * @version @Revision: 789534 $
  */
 public class HybridSourceDataBinding extends JAXBDataBinding {
-    private XMLStreamDataReader xsrReader;
-    private XMLStreamDataWriter xswWriter;
-    private NodeDataWriter nodeWriter;
-    private NodeDataReader nodeReader;
-    
     public HybridSourceDataBinding() {
         super();
-        this.xsrReader = new XMLStreamDataReader();
-        this.xswWriter = new XMLStreamDataWriter();
-
-        this.nodeReader = new NodeDataReader();
-        this.nodeWriter = new NodeDataWriter(); 
     }
     
     @SuppressWarnings("unchecked")
     @Override
     public <T> DataReader<T> createReader(Class<T> cls) {
         if (cls == XMLStreamReader.class) {
-            return (DataReader<T>) xsrReader;
+            return (DataReader<T>) new XMLStreamDataReader();
         } else if (cls == Node.class) {
-            return (DataReader<T>) nodeReader;
+            return (DataReader<T>) new NodeDataReader();
         } else {
             throw new UnsupportedOperationException("The type " + cls.getName() + " is not supported.");
         }
@@ -74,9 +64,9 @@ public class HybridSourceDataBinding ext
     @Override
     public <T> DataWriter<T> createWriter(Class<T> cls) {
         if (cls == XMLStreamWriter.class) {
-            return (DataWriter<T>) xswWriter;
+            return (DataWriter<T>) new XMLStreamDataWriter();
         } else if (cls == Node.class) {
-            return (DataWriter<T>) nodeWriter;
+            return (DataWriter<T>) new NodeDataWriter();
         } else {
             throw new UnsupportedOperationException("The type " + cls.getName() + " is not supported.");
         }

Modified: camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java?rev=1057758&r1=1057757&r2=1057758&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java (original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java Tue Jan 11 17:40:45 2011
@@ -59,7 +59,6 @@ public class HtmlToPdfMojo extends Abstr
      * The URL to the confluence page to convert.
      *
      * @parameter expression="${page}"
-     *            default-value="http://cwiki.apache.org/confluence/display/CAMEL/Index"
      * @required
      */
     private String page;