activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r525889 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/converter/ main/java/org/apache/camel/converter/jaxp/ main/java/org/apache/camel/impl/converter/ main/java/org/apache/camel/util/ test/java/org/apache/camel/conve...
Date Thu, 05 Apr 2007 17:06:32 GMT
Author: jstrachan
Date: Thu Apr  5 10:06:31 2007
New Revision: 525889

URL: http://svn.apache.org/viewvc?view=rev&rev=525889
Log:
added some more helper methods and fixed up the type conversion from String -> Source

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
  (with props)
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/JaxpConverter.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java

Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java?view=auto&rev=525889
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
(added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
Thu Apr  5 10:06:31 2007
@@ -0,0 +1,20 @@
+package org.apache.camel.converter;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/**
+ * Used to indicate that the actual type of a parameter on a converter method must have the
given annotation class
+ * to be applicable. e.g. this annotation could be used on a JAXB converter which only applies
to objects with a
+ * JAXB annotation on them
+ *
+ * @version $Revision$
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.PARAMETER})
+public @interface HasAnnotation {
+
+    Class value();
+}

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/JaxpConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/JaxpConverter.java?view=auto&rev=525889
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/JaxpConverter.java
(added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/JaxpConverter.java
Thu Apr  5 10:06:31 2007
@@ -0,0 +1,528 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.converter.jaxp;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.lang.reflect.Constructor;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.Converter;
+
+/**
+ * A helper class to transform to and from various JAXB types such as {@link Source} and
{@link Document}
+ *
+ * @version $Revision$
+ */
+@Converter
+public class JaxpConverter {
+    public static final String DEFAULT_CHARSET_PROPERTY = "org.apache.camel.default.charset";
+
+    public static String defaultCharset = ObjectHelper.getSystemProperty(DEFAULT_CHARSET_PROPERTY,
"UTF-8");
+
+    private DocumentBuilderFactory documentBuilderFactory;
+    private TransformerFactory transformerFactory;
+
+    /*
+     * When converting a DOM tree to a SAXSource,
+     * we try to use Xalan internal DOM parser if
+     * available.  Else, transform the DOM tree
+     * to a String and build a SAXSource on top of
+     * it.
+     */
+    private static final Class dom2SaxClass;
+
+    static {
+        Class cl = null;
+        try {
+            cl = Class.forName("org.apache.xalan.xsltc.trax.DOM2SAX");
+        } catch (Throwable t) {}
+        dom2SaxClass = cl;
+    }
+
+
+    public JaxpConverter() {
+    }
+
+    public JaxpConverter(DocumentBuilderFactory documentBuilderFactory) {
+        this.documentBuilderFactory = documentBuilderFactory;
+    }
+
+
+    /**
+     * Converts the given input Source into the required result
+     */
+    public void toResult(Source source, Result result) throws TransformerException {
+        if (source == null) {
+            return;
+        }
+        Transformer transformer = createTransfomer();
+        if (transformer == null) {
+            throw new TransformerException("Could not create a transformer - JAXP is misconfigured!");
+        }
+        transformer.setOutputProperty(OutputKeys.ENCODING, defaultCharset);
+        transformer.transform(source, result);
+    }
+
+    /**
+     * Converts the given byte[] to a Source
+     */
+    @Converter
+    public BytesSource toSource(byte[] data) {
+        return new BytesSource(data);
+    }
+
+
+    /**
+     * Converts the given String to a Source
+     */
+    @Converter
+    public StringSource toSource(String data) {
+        return new StringSource(data);
+    }
+
+    /**
+     * Converts the given Document to a Source
+     */
+    @Converter
+    public DOMSource toSource(Document document) {
+        return new DOMSource(document);
+    }
+
+    /**
+     * Converts the given input Source into text
+     */
+    @Converter
+    public String toString(Source source) throws TransformerException {
+        if (source == null) {
+            return null;
+        } else if (source instanceof StringSource) {
+            return ((StringSource) source).getText();
+        } else if (source instanceof BytesSource) {
+            return new String(((BytesSource) source).getData());
+        } else {
+            StringWriter buffer = new StringWriter();
+            toResult(source, new StreamResult(buffer));
+            return buffer.toString();
+        }
+    }
+
+    /**
+     * Converts the given input Node into text
+     */
+    @Converter
+    public String toString(Node node) throws TransformerException {
+        return toString(new DOMSource(node));
+    }
+
+    /**
+     * Converts the source instance to a {@link DOMSource} or returns null if the conversion
is not
+     * supported (making it easy to derive from this class to add new kinds of conversion).
+     */
+    @Converter
+    public DOMSource toDOMSource(Source source) throws ParserConfigurationException, IOException,
SAXException, TransformerException {
+        if (source instanceof DOMSource) {
+            return (DOMSource) source;
+        }
+        else if (source instanceof SAXSource) {
+            return toDOMSourceFromSAX((SAXSource) source);
+        }
+        else if (source instanceof StreamSource) {
+            return toDOMSourceFromStream((StreamSource) source);
+        }
+        else {
+            return null;
+        }
+    }
+
+    /**
+     * Converts the source instance to a {@link SAXSource} or returns null if the conversion
is not
+     * supported (making it easy to derive from this class to add new kinds of conversion).
+     */
+    @Converter
+    public SAXSource toSAXSource(Source source) throws IOException, SAXException, TransformerException
{
+        if (source instanceof SAXSource) {
+            return (SAXSource) source;
+        }
+        else if (source instanceof DOMSource) {
+            return toSAXSourceFromDOM((DOMSource) source);
+        }
+        else if (source instanceof StreamSource) {
+            return toSAXSourceFromStream((StreamSource) source);
+        }
+        else {
+            return null;
+        }
+    }
+
+    @Converter
+    public StreamSource toStreamSource(Source source) throws TransformerException {
+        if (source instanceof StreamSource) {
+            return (StreamSource) source;
+        } else if (source instanceof DOMSource) {
+            return toStreamSourceFromDOM((DOMSource) source);
+        } else if (source instanceof SAXSource) {
+            return toStreamSourceFromSAX((SAXSource) source);
+        } else {
+            return null;
+        }
+    }
+
+    @Converter
+    public StreamSource toStreamSourceFromSAX(SAXSource source) throws TransformerException
{
+        InputSource inputSource = source.getInputSource();
+        if (inputSource != null) {
+            if (inputSource.getCharacterStream() != null) {
+                return new StreamSource(inputSource.getCharacterStream());
+            }
+            if (inputSource.getByteStream() != null) {
+                return new StreamSource(inputSource.getByteStream());
+            }
+        }
+        String result = toString(source);
+        return new StringSource(result);
+    }
+
+    @Converter
+    public StreamSource toStreamSourceFromDOM(DOMSource source) throws TransformerException
{
+        String result = toString(source);
+        return new StringSource(result);
+    }
+
+    @Converter
+    public SAXSource toSAXSourceFromStream(StreamSource source) {
+        InputSource inputSource;
+        if (source.getReader() != null) {
+            inputSource = new InputSource(source.getReader());
+        } else {
+            inputSource = new InputSource(source.getInputStream());
+        }
+        inputSource.setSystemId(source.getSystemId());
+        inputSource.setPublicId(source.getPublicId());
+        return new SAXSource(inputSource);
+    }
+
+    @Converter
+    public Reader toReaderFromSource(Source src) throws TransformerException {
+        StreamSource stSrc = toStreamSource(src);
+        Reader r = stSrc.getReader();
+        if (r == null) {
+            r = new InputStreamReader(stSrc.getInputStream());
+        }
+        return r;
+    }
+
+    @Converter
+    public DOMSource toDOMSourceFromStream(StreamSource source) throws ParserConfigurationException,
IOException, SAXException {
+        DocumentBuilder builder = createDocumentBuilder();
+        String systemId = source.getSystemId();
+        Document document = null;
+        Reader reader = source.getReader();
+        if (reader != null) {
+            document = builder.parse(new InputSource(reader));
+        } else {
+            InputStream inputStream = source.getInputStream();
+            if (inputStream != null) {
+                InputSource inputsource = new InputSource(inputStream);
+                inputsource.setSystemId(systemId);
+                document = builder.parse(inputsource);
+            }
+            else {
+                throw new IOException("No input stream or reader available");
+            }
+        }
+        return new DOMSource(document, systemId);
+    }
+
+    @Converter
+    public SAXSource toSAXSourceFromDOM(DOMSource source) throws TransformerException {
+        if (dom2SaxClass != null) {
+            try {
+                Constructor cns = dom2SaxClass.getConstructor(new Class[] { Node.class });
+                XMLReader converter = (XMLReader) cns.newInstance(new Object[] { source.getNode()
});
+                return new SAXSource(converter, new InputSource());
+            } catch (Exception e) {
+                throw new TransformerException(e);
+            }
+        } else {
+            String str = toString(source);
+            StringReader reader = new StringReader(str);
+            return new SAXSource(new InputSource(reader));
+        }
+    }
+
+    @Converter
+    public DOMSource toDOMSourceFromSAX(SAXSource source) throws IOException, SAXException,
ParserConfigurationException, TransformerException {
+        return new DOMSource(toDOMNodeFromSAX(source));
+    }
+
+    @Converter
+    public Node toDOMNodeFromSAX(SAXSource source) throws ParserConfigurationException, IOException,
SAXException, TransformerException {
+        DOMResult result = new DOMResult();
+        toResult(source, result);
+        return result.getNode();
+    }
+
+    /**
+     * Converts the given TRaX Source into a W3C DOM node
+     * @throws SAXException
+     * @throws IOException
+     * @throws ParserConfigurationException
+     */
+    @Converter
+    public Node toDOMNode(Source source) throws TransformerException, ParserConfigurationException,
IOException, SAXException {
+        DOMSource domSrc = toDOMSource(source);
+        return domSrc != null ? domSrc.getNode() :  null;
+    }
+
+    /**
+     * Create a DOM element from the given source.
+     *
+     * @param source
+     * @return
+     * @throws TransformerException
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     */
+    @Converter
+    public Element toDOMElement(Source source) throws TransformerException, ParserConfigurationException,
IOException, SAXException {
+        Node node = toDOMNode(source);
+        return toDOMElement(node);
+    }
+
+    /**
+     * Create a DOM element from the DOM node.
+     * Simply cast if the node is an Element, or
+     * return the root element if it is a Document.
+     *
+     * @param node
+     * @return
+     * @throws TransformerException
+     */
+    @Converter
+    public Element toDOMElement(Node node) throws TransformerException {
+        // If the node is an document, return the root element
+        if (node instanceof Document) {
+            return ((Document) node).getDocumentElement();
+        // If the node is an element, just cast it
+        } else if (node instanceof Element) {
+            return (Element) node;
+        // Other node types are not handled
+        } else {
+            throw new TransformerException("Unable to convert DOM node to an Element");
+        }
+    }
+
+    /**
+     * Converts the given data to a DOM document
+     *
+     * @param data is the data to be parsed
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(byte[] data) throws IOException, SAXException, ParserConfigurationException
{
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return documentBuilder.parse(new ByteArrayInputStream(data));
+    }
+
+    /**
+     * Converts the given {@link InputStream} to a DOM document
+     *
+     * @param in is the data to be parsed
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(InputStream in) throws IOException, SAXException, ParserConfigurationException
{
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return documentBuilder.parse(in);
+    }
+
+    /**
+     * Converts the given {@link InputSource} to a DOM document
+     *
+     * @param in is the data to be parsed
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(InputSource in) throws IOException, SAXException, ParserConfigurationException
{
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return documentBuilder.parse(in);
+    }
+
+    /**
+     * Converts the given {@link String} to a DOM document
+     *
+     * @param text is the data to be parsed
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(String text) throws IOException, SAXException, ParserConfigurationException
{
+        return toDOMDocument(text.getBytes());
+    }
+
+    /**
+     * Converts the given {@link File} to a DOM document
+     *
+     * @param file is the data to be parsed
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(File file) throws IOException, SAXException, ParserConfigurationException
{
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return documentBuilder.parse(file);
+    }
+
+
+    /**
+     * Create a DOM document from the given source.
+     *
+     * @param source
+     * @return
+     * @throws TransformerException
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     */
+    @Converter
+    public Document toDOMDocument(Source source) throws TransformerException, ParserConfigurationException,
IOException, SAXException {
+        Node node = toDOMNode(source);
+        return toDOMDocument(node);
+    }
+
+    /**
+     * Create a DOM document from the given Node.
+     * If the node is an document, just cast it,
+     * if the node is an root element, retrieve its
+     * owner element or create a new document and import
+     * the node.
+     *
+     * @param node
+     * @return
+     * @throws ParserConfigurationException
+     * @throws TransformerException
+     */
+    @Converter
+    public Document toDOMDocument(Node node) throws ParserConfigurationException, TransformerException
{
+        // If the node is the document, just cast it
+        if (node instanceof Document) {
+            return (Document) node;
+        // If the node is an element
+        } else if (node instanceof Element) {
+            Element elem = (Element) node;
+            // If this is the root element, return its owner document
+            if (elem.getOwnerDocument().getDocumentElement() == elem) {
+                return elem.getOwnerDocument();
+            // else, create a new doc and copy the element inside it
+            } else {
+                Document doc = createDocument();
+                doc.appendChild(doc.importNode(node, true));
+                return doc;
+            }
+        // other element types are not handled
+        } else {
+            throw new TransformerException("Unable to convert DOM node to a Document");
+        }
+    }
+
+    // Properties
+    //-------------------------------------------------------------------------
+    public DocumentBuilderFactory getDocumentBuilderFactory() {
+        if (documentBuilderFactory == null) {
+            documentBuilderFactory = createDocumentBuilderFactory();
+        }
+        return documentBuilderFactory;
+    }
+
+    public void setDocumentBuilderFactory(DocumentBuilderFactory documentBuilderFactory)
{
+        this.documentBuilderFactory = documentBuilderFactory;
+    }
+
+
+    // Helper methods
+    //-------------------------------------------------------------------------
+    public DocumentBuilderFactory createDocumentBuilderFactory() {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        factory.setIgnoringElementContentWhitespace(true);
+        factory.setIgnoringComments(true);
+        return factory;
+    }
+
+
+    public DocumentBuilder createDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory factory = getDocumentBuilderFactory();
+        return factory.newDocumentBuilder();
+    }
+
+    public Document createDocument() throws ParserConfigurationException {
+        DocumentBuilder builder = createDocumentBuilder();
+        return builder.newDocument();
+    }
+
+    public TransformerFactory getTransformerFactory() {
+        if (transformerFactory == null) {
+            transformerFactory = createTransformerFactory();
+        }
+        return transformerFactory;
+    }
+
+    public void setTransformerFactory(TransformerFactory transformerFactory) {
+        this.transformerFactory = transformerFactory;
+    }
+
+    public Transformer createTransfomer() throws TransformerConfigurationException {
+        TransformerFactory factory = getTransformerFactory();
+        return factory.newTransformer();
+    }
+
+    public TransformerFactory createTransformerFactory() {
+        TransformerFactory answer = TransformerFactory.newInstance();
+        return answer;
+    }
+
+}
\ No newline at end of file

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?view=diff&rev=525889&r1=525888&r2=525889
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
Thu Apr  5 10:06:31 2007
@@ -17,11 +17,6 @@
  */
 package org.apache.camel.impl.converter;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.impl.ReflectionInjector;
@@ -30,6 +25,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @version $Revision$
  */
@@ -61,13 +62,14 @@
         if (converter != null) {
             return converter.convertTo(toType, value);
         }
-        
+
         for (TypeConverter fallback : fallbackConverters) {
-			T rc = fallback.convertTo(toType, value);
-			if( rc!=null )
-				return rc;
-		}
-        
+            T rc = fallback.convertTo(toType, value);
+            if (rc != null) {
+                return rc;
+            }
+        }
+
         return null;
     }
 
@@ -123,16 +125,6 @@
      * Tries to auto-discover any available type converters
      */
     protected TypeConverter findTypeConverter(Class toType, Class fromType, Object value)
{
-        // lets try the super classes of the to type
-        for (Class toSuperClass = toType.getSuperclass();
-             toSuperClass != null && !toSuperClass.equals(Object.class);
-             toSuperClass = toSuperClass.getSuperclass()) {
-
-            TypeConverter converter = getTypeConverter(toSuperClass, fromType);
-            if (converter != null) {
-                return converter;
-            }
-        }
 
         // TODO should we filter out any interfaces which are super-interfaces?
         for (Class type : toType.getInterfaces()) {
@@ -162,6 +154,20 @@
                 }
             }
         }
+
+        // lets try classes derived from this toType
+
+        Set<Map.Entry<TypeMapping, TypeConverter>> entries = typeMappings.entrySet();
+        for (Map.Entry<TypeMapping, TypeConverter> entry : entries) {
+            TypeMapping key = entry.getKey();
+            Class aToType = key.getToType();
+            if (toType.isAssignableFrom(aToType)) {
+                if (fromType.isAssignableFrom(key.getFromType())) {
+                    return entry.getValue();
+                }
+            }
+        }
+
         // TODO look at constructors of toType?
         return null;
     }
@@ -220,10 +226,10 @@
             }
             return answer;
         }
-        
+
         @Override
         public String toString() {
-        	return "["+fromType+"=>"+toType+"]";
+            return "[" + fromType + "=>" + toType + "]";
         }
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?view=diff&rev=525889&r1=525888&r2=525889
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Thu Apr  5 10:06:31 2007
@@ -164,6 +164,13 @@
     }
 
     /**
+     * Returns the type name of the given value
+     */
+    public static String className(Object value) {
+        return name(value != null ? value.getClass() : null);
+    }
+
+    /**
      * Attempts to load the given class name using the thread context class loader
      * or the class loader used to load this class
      *

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java?view=diff&rev=525889&r1=525888&r2=525889
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
Thu Apr  5 10:06:31 2007
@@ -24,6 +24,8 @@
 import org.apache.camel.impl.converter.DefaultTypeConverter;
 import org.w3c.dom.Document;
 
+import javax.xml.transform.Source;
+
 /**
  * @version $Revision$
  */
@@ -32,7 +34,7 @@
 
     protected TypeConverter converter = new DefaultTypeConverter();
 
-    public void testConvert() throws Exception {
+    public void testConvertToDocument() throws Exception {
         Document document = converter.convertTo(Document.class, "<?xml version=\"1.0\"
encoding=\"UTF-8\"?><hello>world!</hello>");
         assertNotNull(document);
 
@@ -43,5 +45,12 @@
         String text = converter.convertTo(String.class, document);
         // The preamble changes a little under Java 1.6 it adds a standalone="no" attribute.
         assertTrue("Converted to String", text.endsWith("?><hello>world!</hello>"));
+    }
+
+    public void testConvertToSource() throws Exception {
+        Source source = converter.convertTo(Source.class, "<?xml version=\"1.0\" encoding=\"UTF-8\"?><hello>world!</hello>");
+        assertNotNull(source);
+
+        log.debug("Found document: " + source);
     }
 }



Mime
View raw message