Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 58581 invoked from network); 2 Mar 2009 09:11:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Mar 2009 09:11:40 -0000 Received: (qmail 2702 invoked by uid 500); 2 Mar 2009 09:11:40 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 2680 invoked by uid 500); 2 Mar 2009 09:11:40 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 2671 invoked by uid 99); 2 Mar 2009 09:11:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 01:11:40 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 09:11:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 384C32388A1E; Mon, 2 Mar 2009 09:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749248 - in /camel/trunk/components: camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ camel-jaxb/src/test/java/org/apache/camel/example/ camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/ Date: Mon, 02 Mar 2009 09:11:18 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090302091119.384C32388A1E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Mon Mar 2 09:11:18 2009 New Revision: 749248 URL: http://svn.apache.org/viewvc?rev=749248&view=rev Log: CAMEL-588: Fixed bad package tangle. Modified: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java Modified: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=749248&r1=749247&r2=749248&view=diff ============================================================================== --- camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java (original) +++ camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java Mon Mar 2 09:11:18 2009 @@ -34,8 +34,8 @@ import org.apache.camel.Exchange; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.StreamCache; import org.apache.camel.TypeConverter; -import org.apache.camel.converter.stream.StreamCache; import org.apache.camel.spi.TypeConverterAware; import org.apache.camel.util.ObjectHelper; import org.apache.commons.logging.Log; Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java?rev=749248&r1=749247&r2=749248&view=diff ============================================================================== --- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java (original) +++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java Mon Mar 2 09:11:18 2009 @@ -18,15 +18,14 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; - import javax.xml.bind.UnmarshalException; import junit.framework.TestCase; import org.apache.camel.CamelContext; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.StreamCache; import org.apache.camel.TypeConverter; -import org.apache.camel.converter.stream.StreamCache; import org.apache.camel.impl.DefaultCamelContext; /** Modified: camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java?rev=749248&r1=749247&r2=749248&view=diff ============================================================================== --- camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java (original) +++ camel/trunk/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java Mon Mar 2 09:11:18 2009 @@ -38,6 +38,7 @@ import org.apache.camel.converter.IOConverter; import org.apache.camel.spi.DataFormat; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.IOHelper; import org.apache.xml.security.encryption.EncryptedData; import org.apache.xml.security.encryption.EncryptedKey; import org.apache.xml.security.encryption.XMLCipher; @@ -122,7 +123,7 @@ DOMSource source = new DOMSource(document); try { - IOConverter.copy(IOConverter.toInputStrean(source), stream); + IOHelper.copy(IOConverter.toInputStrean(source), stream); } finally { stream.close(); } @@ -161,7 +162,7 @@ ByteArrayOutputStream bos = new ByteArrayOutputStream(); try { - IOConverter.copy(IOConverter.toInputStrean(source), bos); + IOHelper.copy(IOConverter.toInputStrean(source), bos); } finally { bos.close(); }