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(); }