You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/05/24 11:24:20 UTC
svn commit: r947575 - in /camel/trunk/components:
camel-cache/src/main/java/org/apache/camel/component/cache/
camel-cache/src/main/java/org/apache/camel/processor/cache/
camel-crypto/src/main/java/org/apache/camel/converter/crypto/
camel-cxf/src/main/j...
Author: ningjiang
Date: Mon May 24 09:24:19 2010
New Revision: 947575
URL: http://svn.apache.org/viewvc?rev=947575&view=rev
Log:
Replaced the calling of deprecated camel API
Modified:
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java Mon May 24 09:24:19 2010
@@ -26,8 +26,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class CacheConfiguration {
- private static final transient Log LOG = LogFactory.getLog(CacheConfiguration.class);
- private URI uri;
private String cacheName;
private int maxElementsInMemory = 1000;
private MemoryStoreEvictionPolicy memoryStoreEvictionPolicy = MemoryStoreEvictionPolicy.LFU;
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java Mon May 24 09:24:19 2010
@@ -20,12 +20,11 @@ import java.io.InputStream;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.cache.CacheManagerFactory;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,7 +66,7 @@ public class CacheBasedTokenReplacer ext
try {
buffer = IOConverter.toBytes(is);
} finally {
- ObjectHelper.close(is, "is", LOG);
+ IOHelper.close(is, "is", LOG);
}
// Note: The value in the cache must be a String
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java Mon May 24 09:24:19 2010
@@ -30,16 +30,16 @@ import org.w3c.dom.Document;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.cache.CacheManagerFactory;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
public class CacheBasedXPathReplacer extends CacheValidate implements Processor {
private static final transient Log LOG = LogFactory.getLog(CacheBasedXPathReplacer.class);
private String cacheName;
@@ -79,7 +79,7 @@ public class CacheBasedXPathReplacer ext
try {
document = exchange.getContext().getTypeConverter().convertTo(Document.class, exchange, is);
} finally {
- ObjectHelper.close(is, "is", LOG);
+ IOHelper.close(is, "is", LOG);
}
InputStream cis = exchange.getContext().getTypeConverter()
@@ -102,7 +102,7 @@ public class CacheBasedXPathReplacer ext
transformer.setParameter("cacheValue", cacheValueDocument);
transformer.transform(source, result);
} finally {
- ObjectHelper.close(cis, "cis", LOG);
+ IOHelper.close(cis, "cis", LOG);
}
}
Modified: camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java (original)
+++ camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java Mon May 24 09:24:19 2010
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.security.Key;
import java.security.spec.AlgorithmParameterSpec;
+
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
@@ -36,7 +37,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -139,7 +139,7 @@ public class CryptoDataFormat implements
cipherStream.write(mac);
}
} finally {
- ObjectHelper.close(cipherStream, "cipher", LOG);
+ IOHelper.close(cipherStream, "cipher", LOG);
}
}
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java Mon May 24 09:24:19 2010
@@ -56,7 +56,7 @@ public final class CxfUtils {
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
writeElement(element, writer, namespaces);
XmlConverter converter = new XmlConverter();
- return converter.toString(converter.toSource(writer.getDocument()), null);
+ return converter.toString(converter.toDOMSource(writer.getDocument()), null);
}
private static void writeElement(Element e,
Modified: camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java (original)
+++ camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java Mon May 24 09:24:19 2010
@@ -81,6 +81,7 @@ public final class ExecResultConverter {
* @throws FileNotFoundException if there is a file in the execResult, and
* the file can not be found
*/
+ @SuppressWarnings("unchecked")
public static <T> T convertTo(Class<T> type, Exchange exchange, ExecResult result) throws FileNotFoundException {
InputStream is = toInputStream(result);
if (is != null) {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Mon May 24 09:24:19 2010
@@ -34,6 +34,7 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileExist;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -251,7 +252,7 @@ public class FtpOperations implements Re
} catch (IOException e) {
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
} finally {
- ObjectHelper.close(os, "retrieve: " + name, log);
+ IOHelper.close(os, "retrieve: " + name, log);
}
}
@@ -310,7 +311,7 @@ public class FtpOperations implements Re
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
} finally {
// need to close the stream before rename it
- ObjectHelper.close(os, "retrieve: " + name, log);
+ IOHelper.close(os, "retrieve: " + name, log);
}
if (log.isDebugEnabled()) {
@@ -359,7 +360,7 @@ public class FtpOperations implements Re
} catch (InvalidPayloadException e) {
throw new GenericFileOperationFailedException("Cannot store file: " + name, e);
} finally {
- ObjectHelper.close(is, "store: " + name, log);
+ IOHelper.close(is, "store: " + name, log);
}
}
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java Mon May 24 09:24:19 2010
@@ -24,6 +24,7 @@ import java.util.Map;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
@@ -74,7 +75,7 @@ public class FtpsEndpoint extends FtpEnd
try {
keyStore.load(keyStoreFileInputStream, password.toCharArray());
} finally {
- ObjectHelper.close(keyStoreFileInputStream, "keyStore", log);
+ IOHelper.close(keyStoreFileInputStream, "keyStore", log);
}
KeyManagerFactory keyMgrFactory = KeyManagerFactory.getInstance(algorithm);
@@ -97,7 +98,7 @@ public class FtpsEndpoint extends FtpEnd
try {
trustStore.load(trustStoreFileInputStream, password.toCharArray());
} finally {
- ObjectHelper.close(trustStoreFileInputStream, "trustStore", log);
+ IOHelper.close(trustStoreFileInputStream, "trustStore", log);
}
TrustManagerFactory trustMgrFactory = TrustManagerFactory.getInstance(algorithm);
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Mon May 24 09:24:19 2010
@@ -42,6 +42,7 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -339,7 +340,7 @@ public class SftpOperations implements R
} catch (SftpException e) {
throw new GenericFileOperationFailedException("Cannot retrieve file: " + name, e);
} finally {
- ObjectHelper.close(os, "retrieve: " + name, LOG);
+ IOHelper.close(os, "retrieve: " + name, LOG);
}
}
@@ -395,7 +396,7 @@ public class SftpOperations implements R
} catch (SftpException e) {
throw new GenericFileOperationFailedException("Cannot retrieve file: " + name, e);
} finally {
- ObjectHelper.close(os, "retrieve: " + name, LOG);
+ IOHelper.close(os, "retrieve: " + name, LOG);
}
if (LOG.isDebugEnabled()) {
@@ -443,7 +444,7 @@ public class SftpOperations implements R
} catch (InvalidPayloadException e) {
throw new GenericFileOperationFailedException("Cannot store file: " + name, e);
} finally {
- ObjectHelper.close(is, "store: " + name, LOG);
+ IOHelper.close(is, "store: " + name, LOG);
}
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java Mon May 24 09:24:19 2010
@@ -26,7 +26,6 @@ import org.apache.camel.component.http.h
import org.apache.camel.impl.PollingConsumerSupport;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
@@ -77,7 +76,7 @@ public class HttpPollingConsumer extends
IOHelper.copy(is, bos);
bos.flush();
} finally {
- ObjectHelper.close(is, "input stream", null);
+ IOHelper.close(is, "input stream", null);
}
Message message = exchange.getIn();
message.setBody(bos.createInputStream());
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Mon May 24 09:24:19 2010
@@ -32,7 +32,6 @@ import org.apache.camel.impl.DefaultProd
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
@@ -227,7 +226,7 @@ public class HttpProducer extends Defaul
IOHelper.copy(is, cos);
return cos.getInputStream();
} finally {
- ObjectHelper.close(is, "Extracting response body", LOG);
+ IOHelper.close(is, "Extracting response body", LOG);
}
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/GZIPHelper.java Mon May 24 09:24:19 2010
@@ -26,7 +26,6 @@ import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
/**
* Helper class to help wrapping content into GZIP input and output streams.
@@ -54,8 +53,8 @@ public final class GZIPHelper {
gzip.finish();
return new ByteArrayInputStream(os.toByteArray());
} finally {
- ObjectHelper.close(gzip, "gzip", null);
- ObjectHelper.close(os, "byte array output stream", null);
+ IOHelper.close(gzip, "gzip", null);
+ IOHelper.close(os, "byte array output stream", null);
}
} else {
return in;
@@ -74,8 +73,8 @@ public final class GZIPHelper {
gzip.finish();
return new ByteArrayInputStream(os.toByteArray());
} finally {
- ObjectHelper.close(gzip, "gzip", null);
- ObjectHelper.close(os, "byte array", null);
+ IOHelper.close(gzip, "gzip", null);
+ IOHelper.close(os, "byte array", null);
}
} else {
return new ByteArrayInputStream(data);
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java Mon May 24 09:24:19 2010
@@ -26,7 +26,6 @@ import org.apache.camel.component.http4.
import org.apache.camel.impl.PollingConsumerSupport;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -84,7 +83,7 @@ public class HttpPollingConsumer extends
IOHelper.copy(is, bos);
bos.flush();
} finally {
- ObjectHelper.close(is, "input stream", null);
+ IOHelper.close(is, "input stream", null);
}
Message message = exchange.getIn();
message.setBody(bos.createInputStream());
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java Mon May 24 09:24:19 2010
@@ -34,7 +34,6 @@ import org.apache.camel.impl.DefaultProd
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
@@ -229,7 +228,7 @@ public class HttpProducer extends Defaul
IOHelper.copy(is, cos);
return cos.getInputStream();
} finally {
- ObjectHelper.close(is, "Extracting response body", LOG);
+ IOHelper.close(is, "Extracting response body", LOG);
}
}
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/GZIPHelper.java Mon May 24 09:24:19 2010
@@ -26,7 +26,6 @@ import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
/**
* Helper class to help wrapping content into GZIP input and output streams.
@@ -54,8 +53,8 @@ public final class GZIPHelper {
gzip.finish();
return new ByteArrayInputStream(os.toByteArray());
} finally {
- ObjectHelper.close(gzip, "gzip", null);
- ObjectHelper.close(os, "byte array output stream", null);
+ IOHelper.close(gzip, "gzip", null);
+ IOHelper.close(os, "byte array output stream", null);
}
} else {
return in;
@@ -74,8 +73,8 @@ public final class GZIPHelper {
gzip.finish();
return new ByteArrayInputStream(os.toByteArray());
} finally {
- ObjectHelper.close(gzip, "gzip", null);
- ObjectHelper.close(os, "byte array", null);
+ IOHelper.close(gzip, "gzip", null);
+ IOHelper.close(os, "byte array", null);
}
} else {
return new ByteArrayInputStream(data);
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=947575&r1=947574&r2=947575&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 May 24 09:24:19 2010
@@ -38,13 +38,13 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.StreamCache;
import org.apache.camel.TypeConverter;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.spi.TypeConverterAware;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -210,7 +210,7 @@ public class FallbackTypeConverter imple
}
} finally {
if (value instanceof Closeable) {
- ObjectHelper.close((Closeable)value, "Unmarshalling", LOG);
+ IOHelper.close((Closeable)value, "Unmarshalling", LOG);
}
}
return null;
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java Mon May 24 09:24:19 2010
@@ -28,7 +28,7 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTimedOutException;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jetty.client.ContentExchange;
@@ -75,7 +75,7 @@ public class JettyContentExchange extend
// close the input stream when its not needed anymore
InputStream is = getRequestContentSource();
if (is != null) {
- ObjectHelper.close(is, "RequestContentSource", LOG);
+ IOHelper.close(is, "RequestContentSource", LOG);
}
}
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java Mon May 24 09:24:19 2010
@@ -36,7 +36,7 @@ import org.apache.camel.osgi.tracker.Bun
import org.apache.camel.osgi.tracker.BundleTrackerCustomizer;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.LanguageResolver;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.framework.Bundle;
@@ -230,7 +230,7 @@ public class Activator implements Bundle
// Do nothing here
} finally {
if (reader != null) {
- ObjectHelper.close(reader, null, LOG);
+ IOHelper.close(reader, null, LOG);
}
}
}
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java Mon May 24 09:24:19 2010
@@ -25,6 +25,7 @@ import java.util.Properties;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.impl.DefaultFactoryFinder;
import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -65,8 +66,8 @@ public class OsgiFactoryFinder extends D
clazz = entry.bundle.loadClass(className);
classMap.put(propertyPrefix + key, clazz);
} finally {
- ObjectHelper.close(reader, key, null);
- ObjectHelper.close(in, key, null);
+ IOHelper.close(reader, key, null);
+ IOHelper.close(in, key, null);
}
} else {
throw new NoFactoryAvailableException(propertyPrefix + key);
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=947575&r1=947574&r2=947575&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Mon May 24 09:24:19 2010
@@ -402,7 +402,7 @@ public abstract class XQueryBuilder impl
} else {
Source source = in.getBody(Source.class);
if (source == null) {
- source = converter.toSource(converter.createDocument());
+ source = converter.toDOMSource(converter.createDocument());
}
DocumentInfo doc = getStaticQueryContext().buildDocument(source);
dynamicQueryContext.setContextItem(doc);