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:22:58 UTC
svn commit: r947574 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/xml/ main/java/org/apache/camel/view/
test/java/org/apache/camel/component/file/
test/java/org/apache/camel/converter/ test/java/org/apache/camel/processor/
Author: ningjiang
Date: Mon May 24 09:22:56 2010
New Revision: 947574
URL: http://svn.apache.org/viewvc?rev=947574&view=rev
Log:
Replaced the calling of deprecated camel API
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=947574&r1=947573&r2=947574&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Mon May 24 09:22:56 2010
@@ -291,7 +291,7 @@ public class XsltBuilder implements Proc
throw new ExpectedBodyTypeException(exchange, Source.class);
} else {
try {
- source = converter.toSource(converter.createDocument());
+ source = converter.toDOMSource(converter.createDocument());
} catch (ParserConfigurationException e) {
throw new RuntimeTransformException(e);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java?rev=947574&r1=947573&r2=947574&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java Mon May 24 09:22:56 2010
@@ -106,7 +106,7 @@ public class ModelFileGenerator {
outputProperties.put(OutputKeys.OMIT_XML_DECLARATION, "no");
outputProperties.put(OutputKeys.INDENT, "yes");
- converter.toResult(converter.toSource(doc), result, outputProperties);
+ converter.toResult(converter.toDOMSource(doc), result, outputProperties);
}
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java?rev=947574&r1=947573&r2=947574&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java Mon May 24 09:22:56 2010
@@ -144,7 +144,7 @@ public class FileConcurrentTest extends
private Random ran = new Random();
- public String processData(@Body String data, @Header(value = "id") int id, @Headers Map headers, TypeConverter converter) {
+ public String processData(@Body String data, @Header(value = "id") int id, @Headers Map<String, Object> headers, TypeConverter converter) {
// simulate some heavy calculations
int num = 200 + ran.nextInt(500);
try {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java?rev=947574&r1=947573&r2=947574&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java Mon May 24 09:22:56 2010
@@ -17,11 +17,8 @@
package org.apache.camel.converter;
import org.apache.camel.ContextTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class TimePatternConverterTest extends ContextTestSupport {
- private static final transient Log LOG = LogFactory.getLog(TimePatternConverterTest.class);
public void testMillisecondsTimePattern() throws Exception {
String source = new String("444");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=947574&r1=947573&r2=947574&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java Mon May 24 09:22:56 2010
@@ -29,7 +29,7 @@ import org.apache.camel.model.SplitDefin
public class SplitterWithCustomThreadPoolExecutorTest extends ContextTestSupport {
- protected ThreadPoolExecutor customThreadPoolExecutor = new ThreadPoolExecutor(8, 16, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue());
+ protected ThreadPoolExecutor customThreadPoolExecutor = new ThreadPoolExecutor(8, 16, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
public void testSplitterWithCustomThreadPoolExecutor() throws Exception {
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) getSplitter().getExecutorService();