You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/03/07 09:16:03 UTC
svn commit: r751221 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/component/direct/
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apache/camel/converter/...
Author: davsclaus
Date: Sat Mar 7 08:16:01 2009
New Revision: 751221
URL: http://svn.apache.org/viewvc?rev=751221&view=rev
Log:
CAMEL-1428: Fixed NPE for SFTP consumer move strategy. Fixed checkstyle. Fixed unused imports and other findings by report tool.
Added:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java (contents, props changed)
- copied, changed from r751203, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CountingLatch.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java Sat Mar 7 08:16:01 2009
@@ -22,15 +22,13 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.camel.spi.Registry;
-
/**
* Used to indicate an injection point of an {@link Endpoint}, {@link Producer} or
* {@link ProducerTemplate} into a POJO.
*
* A <a href="http://camel.apache.org/uris.html">URI</a> for an endpoint
* can be specified on this annotation, or a name can be specified which is resolved in the
- * {@link Registry} such as in your Spring ApplicationContext.
+ * {@link org.apache.camel.spi.Registry} such as in your Spring ApplicationContext.
*
* If no name or uri is specified then the name is defaulted from the field, property or method name.
*
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchBeanException.java Sat Mar 7 08:16:01 2009
@@ -16,10 +16,8 @@
*/
package org.apache.camel;
-import org.apache.camel.spi.Registry;
-
/**
- * A runtime exception if a given bean could not be found in the {@link Registry}
+ * A runtime exception if a given bean could not be found in the {@link org.apache.camel.spi.Registry}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchHeaderException.java Sat Mar 7 08:16:01 2009
@@ -16,13 +16,11 @@
*/
package org.apache.camel;
-import org.apache.camel.util.ExchangeHelper;
-
/**
* An exception caused when a mandatory header is not available on a message
* {@link Exchange}
*
- * @see ExchangeHelper#getMandatoryHeader(Exchange, String, Class)
+ * @see org.apache.camel.util.ExchangeHelper#getMandatoryHeader(Exchange, String, Class)
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchPropertyException.java Sat Mar 7 08:16:01 2009
@@ -16,13 +16,11 @@
*/
package org.apache.camel;
-import org.apache.camel.util.ExchangeHelper;
-
/**
* An exception caused when a mandatory property is not available on a message
* {@link Exchange}
*
- * @see ExchangeHelper#getMandatoryProperty(Exchange, String, Class)
+ * @see org.apache.camel.util.ExchangeHelper#getMandatoryProperty(Exchange, String, Class)
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java Sat Mar 7 08:16:01 2009
@@ -20,7 +20,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultConsumer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java Sat Mar 7 08:16:01 2009
@@ -36,7 +36,7 @@
result.setFile(file);
GenericFileConfiguration config = new GenericFileConfiguration();
- config.setFile(file.getPath());
+ config.setDirectory(file.getPath());
result.setConfiguration(config);
FileOperations operations = new FileOperations();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Sat Mar 7 08:16:01 2009
@@ -28,11 +28,11 @@
*/
public class FileConsumer extends GenericFileConsumer<File> {
- private String rootPath;
+ private String endpointPath;
public FileConsumer(GenericFileEndpoint<File> endpoint, Processor processor, GenericFileOperations<File> operations) {
super(endpoint, processor, operations);
- this.rootPath = endpoint.getConfiguration().getFile();
+ this.endpointPath = endpoint.getConfiguration().getDirectory();
}
protected void pollDirectory(String fileName, List<GenericFile<File>> fileList) {
@@ -61,7 +61,7 @@
}
for (File file : files) {
// createa a generic file
- GenericFile<File> gf = asGenericFile(rootPath, file);
+ GenericFile<File> gf = asGenericFile(endpointPath, file);
if (file.isDirectory()) {
if (endpoint.isRecursive() && isValidFile(gf, true)) {
@@ -88,7 +88,7 @@
}
// createa a generic file
- GenericFile<File> gf = asGenericFile(rootPath, file);
+ GenericFile<File> gf = asGenericFile(endpointPath, file);
if (isValidFile(gf, false)) {
// matched file so add
@@ -99,13 +99,14 @@
/**
* Creates a new GenericFile<File> based on the given file.
*
+ * @param endpointPath the starting directory the endpoint was configued with
* @param file the source file
* @return wrapped as a GenericFile
*/
- public static GenericFile<File> asGenericFile(String rootPath, File file) {
+ public static GenericFile<File> asGenericFile(String endpointPath, File file) {
GenericFile<File> answer = new GenericFile<File>();
// use file specific binding
- answer.setEndpointPath(rootPath);
+ answer.setEndpointPath(endpointPath);
answer.setBinding(new FileBinding());
answer.setFile(file);
answer.setFileLength(file.length());
@@ -121,10 +122,10 @@
if (file.isAbsolute()) {
answer.setRelativeFileName(null);
} else {
- // skip root path
File path;
- if (file.getPath().startsWith(rootPath)) {
- path = new File(ObjectHelper.after(file.getPath(), rootPath + File.separator));
+ if (file.getPath().startsWith(endpointPath)) {
+ // skip duplicate endpoint path
+ path = new File(ObjectHelper.after(file.getPath(), endpointPath + File.separator));
} else {
path = new File(file.getPath());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Sat Mar 7 08:16:01 2009
@@ -103,7 +103,7 @@
public void setFile(File file) {
this.file = file;
// update configuration as well
- getConfiguration().setFile(file.getPath());
+ getConfiguration().setDirectory(file.getPath());
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Sat Mar 7 08:16:01 2009
@@ -17,8 +17,8 @@
package org.apache.camel.component.file;
import java.io.File;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java Sat Mar 7 08:16:01 2009
@@ -21,30 +21,35 @@
public class GenericFileConfiguration {
- private String file;
+ private String directory;
public boolean needToNormalize() {
return true;
}
public void configure(URI uri) {
- setFile(uri.getPath());
+ setDirectory(uri.getPath());
}
- public String getFile() {
- return file;
+ public String getDirectory() {
+ return directory;
}
- public void setFile(String file) {
- this.file = needToNormalize()
+ public void setDirectory(String directory) {
+ this.directory = needToNormalize()
// must normalize path to cater for Windows and other OS
- ? FileUtil.normalizePath(file)
- // for the remote file we don't need to do that
- : file;
+ ? FileUtil.normalizePath(directory)
+ // for the remote directory we don't need to do that
+ : directory;
+
+ // endpoint directory must not be null
+ if (this.directory == null) {
+ this.directory = "";
+ }
}
public String toString() {
- return file;
+ return directory;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Sat Mar 7 08:16:01 2009
@@ -62,7 +62,7 @@
// gather list of files to process
List<GenericFile<T>> files = new ArrayList<GenericFile<T>>();
- String name = endpoint.getConfiguration().getFile();
+ String name = endpoint.getConfiguration().getDirectory();
pollDirectory(name, files);
// sort files using file comparator if provided
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java Sat Mar 7 08:16:01 2009
@@ -411,12 +411,12 @@
public void configureMessage(GenericFile<T> file, Message message) {
message.setBody(file);
- // compute the name that was written, it should be relative to the endpoint configuraion
+ // compute the name that was written
String name = file.isAbsolute() ? file.getAbsoluteFileName() : file.getRelativeFileName();
- if (name.startsWith(getConfiguration().getFile())) {
- // remove the file path configured on the endpoint for directory=true
- name = name.substring(getConfiguration().getFile().length());
+ // skip leading endpoint configured directory
+ if (name.startsWith(getConfiguration().getDirectory())) {
+ name = ObjectHelper.after(name, getConfiguration().getDirectory());
}
if (name.startsWith(File.separator) || name.startsWith("/")) {
@@ -451,6 +451,7 @@
if (readLockTimeout > 0) {
params.put("readLockTimeout", readLockTimeout);
}
+
return params;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Sat Mar 7 08:16:01 2009
@@ -172,7 +172,7 @@
name = expression.evaluate(exchange, String.class);
}
- String endpointFile = endpoint.getConfiguration().getFile();
+ String endpointFile = endpoint.getConfiguration().getDirectory();
// Its a directory so we should use it as a base path for the filename
// If the path isn't empty, we need to add a trailing / if it isn't already there
String baseDir = "";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/StreamCacheConverter.java Sat Mar 7 08:16:01 2009
@@ -16,10 +16,6 @@
*/
package org.apache.camel.converter.stream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -31,7 +27,6 @@
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.StreamCache;
import org.apache.camel.converter.jaxp.BytesSource;
import org.apache.camel.converter.jaxp.StringSource;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sat Mar 7 08:16:01 2009
@@ -85,7 +85,7 @@
private final Map<String, Endpoint> endpoints = new HashMap<String, Endpoint>();
private final Map<String, Component> components = new HashMap<String, Component>();
private List<Route> routes;
- private List<Service> servicesToClose = new ArrayList<Service>();
+ private final List<Service> servicesToClose = new ArrayList<Service>();
private TypeConverter typeConverter;
private TypeConverterRegistry typeConverterRegistry;
private ExchangeConverter exchangeConverter;
@@ -95,7 +95,7 @@
private LanguageResolver languageResolver = new DefaultLanguageResolver();
private Registry registry;
private LifecycleStrategy lifecycleStrategy;
- private List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
+ private final List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
private Boolean trace;
private Long delay;
@@ -103,7 +103,7 @@
private Map<String, DataFormatDefinition> dataFormats = new HashMap<String, DataFormatDefinition>();
private Map<String, String> properties = new HashMap<String, String>();
private Class<? extends FactoryFinder> factoryFinderClass = FactoryFinder.class;
- private Map<String, RouteService> routeServices = new HashMap<String, RouteService>();
+ private final Map<String, RouteService> routeServices = new HashMap<String, RouteService>();
private ClassResolver classResolver;
private PackageScanClassResolver packageScanClassResolver;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Sat Mar 7 08:16:01 2009
@@ -27,8 +27,6 @@
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.spi.Injector;
-import org.apache.camel.spi.Registry;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
@@ -276,7 +274,7 @@
}
/**
- * Creates a new instance of the given type using the {@link Injector} on the given
+ * Creates a new instance of the given type using the {@link org.apache.camel.spi.Injector} on the given
* {@link CamelContext}
*/
public <T> T newInstance(Class<T> beanType) {
@@ -284,7 +282,7 @@
}
/**
- * Look up the given named bean in the {@link Registry} on the
+ * Look up the given named bean in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext}
*/
public Object lookup(String name) {
@@ -292,7 +290,7 @@
}
/**
- * Look up the given named bean of the given type in the {@link Registry} on the
+ * Look up the given named bean of the given type in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext}
*/
public <T> T lookup(String name, Class<T> beanType) {
@@ -300,7 +298,7 @@
}
/**
- * Look up the given named bean in the {@link Registry} on the
+ * Look up the given named bean in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext} or throws exception if not found.
*/
public Object mandatoryLookup(String name) {
@@ -308,7 +306,7 @@
}
/**
- * Look up the given named bean of the given type in the {@link Registry} on the
+ * Look up the given named bean of the given type in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext} or throws exception if not found.
*/
public <T> T mandatoryLookup(String name, Class<T> beanType) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java Sat Mar 7 08:16:01 2009
@@ -19,7 +19,6 @@
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.spi.ExceptionHandler;
@@ -31,8 +30,8 @@
* @version $Revision$
*/
public class DefaultConsumer extends ServiceSupport implements Consumer {
- private Endpoint endpoint;
- private Processor processor;
+ private final Endpoint endpoint;
+ private final Processor processor;
private AsyncProcessor asyncProcessor;
private ExceptionHandler exceptionHandler;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java Sat Mar 7 08:16:01 2009
@@ -23,10 +23,9 @@
import javax.activation.DataHandler;
import org.apache.camel.Exchange;
-import org.apache.camel.Message;
/**
- * The default implementation of {@link Message}
+ * The default implementation of {@link org.apache.camel.Message}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java Sat Mar 7 08:16:01 2009
@@ -19,12 +19,10 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
-import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
/**
- * A base class for an endpoint which the default consumer mode is to use a {@link PollingConsumer}
+ * A base class for an endpoint which the default consumer mode is to use a {@link org.apache.camel.PollingConsumer}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Sat Mar 7 08:16:01 2009
@@ -47,11 +47,11 @@
* @version $Revision$
*/
public class DefaultRouteContext implements RouteContext {
- private RouteDefinition route;
+ private final RouteDefinition route;
private FromDefinition from;
- private Collection<Route> routes;
+ private final Collection<Route> routes;
private Endpoint endpoint;
- private List<Processor> eventDrivenProcessors = new ArrayList<Processor>();
+ private final List<Processor> eventDrivenProcessors = new ArrayList<Processor>();
private Interceptor lastInterceptor;
private CamelContext camelContext;
private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java Sat Mar 7 08:16:01 2009
@@ -18,7 +18,6 @@
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -26,7 +25,8 @@
import org.apache.camel.Processor;
/**
- * A default implementation of an event driven {@link Consumer} which uses the {@link PollingConsumer}
+ * A default implementation of an event driven {@link org.apache.camel.Consumer} which uses the
+ * {@link PollingConsumer}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java Sat Mar 7 08:16:01 2009
@@ -20,7 +20,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.spi.LifecycleStrategy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java Sat Mar 7 08:16:01 2009
@@ -17,12 +17,12 @@
package org.apache.camel.impl;
import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
/**
- * A helper class for developers wishing to implement an {@link Expression} using Java code with a minimum amount
- * of code to write so that the developer only needs to implement one of the
- * {@link #evaluate(Exchange)} or {@link #evaluate(org.apache.camel.Exchange, Class)} methods.
+ * A helper class for developers wishing to implement an {@link org.apache.camel.Expression}
+ * using Java code with a minimum amount of code to write so that the developer only needs
+ * to implement one of the {@link #evaluate(Exchange)} or
+ * {@link #evaluate(org.apache.camel.Exchange, Class)} methods.
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Sat Mar 7 08:16:01 2009
@@ -33,10 +33,10 @@
*/
public abstract class ServiceSupport implements Service {
private static int threadCounter;
- private AtomicBoolean started = new AtomicBoolean(false);
- private AtomicBoolean starting = new AtomicBoolean(false);
- private AtomicBoolean stopping = new AtomicBoolean(false);
- private AtomicBoolean stopped = new AtomicBoolean(false);
+ private final AtomicBoolean started = new AtomicBoolean(false);
+ private final AtomicBoolean starting = new AtomicBoolean(false);
+ private final AtomicBoolean stopping = new AtomicBoolean(false);
+ private final AtomicBoolean stopped = new AtomicBoolean(false);
private Collection childServices;
private String version;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Sat Mar 7 08:16:01 2009
@@ -25,7 +25,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.model.ProcessorDefinition;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Sat Mar 7 08:16:01 2009
@@ -56,7 +56,7 @@
// A map (Endpoint -> InstrumentationProcessor) to facilitate
// adding per-route interceptor and registering ManagedRoute MBean
- private Map<Endpoint, InstrumentationProcessor> interceptorMap =
+ private final Map<Endpoint, InstrumentationProcessor> interceptorMap =
new HashMap<Endpoint, InstrumentationProcessor>();
public InstrumentationLifecycleStrategy() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java Sat Mar 7 08:16:01 2009
@@ -20,14 +20,17 @@
* @version $Revision: 1.1 $
*/
public final class Constants {
- public static final String JAXB_CONTEXT_PACKAGES =
- "org.apache.camel:" +
- "org.apache.camel.model:" +
- "org.apache.camel.model.config:" +
- "org.apache.camel.model.dataformat:" +
- "org.apache.camel.model.language:" +
- "org.apache.camel.model.loadbalancer";
+
+ public static final String JAXB_CONTEXT_PACKAGES = ""
+ + "org.apache.camel:"
+ + "org.apache.camel.model:"
+ + "org.apache.camel.model.config:"
+ + "org.apache.camel.model.dataformat:"
+ + "org.apache.camel.model.language:"
+ + "org.apache.camel.model.loadbalancer";
+
private Constants() {
}
+
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java Sat Mar 7 08:16:01 2009
@@ -20,7 +20,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Sat Mar 7 08:16:01 2009
@@ -52,7 +52,6 @@
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.language.LanguageExpression;
import org.apache.camel.processor.DelegateProcessor;
-import org.apache.camel.processor.Enricher;
import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.aggregate.AggregationCollection;
import org.apache.camel.processor.aggregate.AggregationStrategy;
@@ -1709,7 +1708,7 @@
* aggregation strategy to aggregate input data and additional
* data.
* @return this processor type
- * @see Enricher
+ * @see org.apache.camel.processor.Enricher
*/
@SuppressWarnings("unchecked")
public Type enrich(String resourceUri, AggregationStrategy aggregationStrategy) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java Sat Mar 7 08:16:01 2009
@@ -20,10 +20,8 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.spi.DataFormat;
-
/**
- * Represents a CSV (Comma Separated Values) {@link DataFormat}
+ * Represents a CSV (Comma Separated Values) {@link org.apache.camel.spi.DataFormat}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java Sat Mar 7 08:16:01 2009
@@ -20,8 +20,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.spi.DataFormat;
-
/**
* Represents a <a href="http://camel.apache.org/flatpack.html">Flatpack</a> {@link org.apache.camel.spi.DataFormat}.
*
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java Sat Mar 7 08:16:01 2009
@@ -20,8 +20,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.spi.DataFormat;
-
/**
* Represents a <a href="http://camel.apache.org/hl7.html">HL7</a> {@link org.apache.camel.spi.DataFormat}.
*
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java Sat Mar 7 08:16:01 2009
@@ -20,11 +20,8 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.spi.DataFormat;
-
/**
* Represents a <a href="http://camel.apache.org/rss.html">RSS</a> {@link org.apache.camel.spi.DataFormat}.
- *
*/
@XmlRootElement(name = "rss")
@XmlAccessorType(XmlAccessType.FIELD)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java Sat Mar 7 08:16:01 2009
@@ -21,10 +21,8 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.spi.DataFormat;
-
/**
- * Represents the XStream XML {@link DataFormat}
+ * Represents the XStream XML {@link org.apache.camel.spi.DataFormat}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java Sat Mar 7 08:16:01 2009
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.model.dataformat;
-
import java.util.zip.Deflater;
import javax.xml.bind.annotation.XmlAccessType;
@@ -28,6 +26,9 @@
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RouteContext;
+/**
+ * Represents the ZIP XML {@link org.apache.camel.spi.DataFormat}
+ */
@XmlRootElement(name = "zip")
@XmlAccessorType(XmlAccessType.FIELD)
public class ZipDataFormat extends DataFormatDefinition {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Sat Mar 7 08:16:01 2009
@@ -21,7 +21,6 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.language.bean.BeanExpression;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java Sat Mar 7 08:16:01 2009
@@ -76,8 +76,7 @@
try {
IntrospectionSupport.setProperty(bean, name, value);
} catch (Exception e) {
- throw new IllegalArgumentException("Failed to set property " +
- name + " on " + bean + ". Reason: " + e, e);
+ throw new IllegalArgumentException("Failed to set property " + name + " on " + bean + ". Reason: " + e, e);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java Sat Mar 7 08:16:01 2009
@@ -20,13 +20,12 @@
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.spi.Policy;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ServiceHelper;
/**
* A Delegate pattern which delegates processing to a nested AsyncProcessor which can
- * be useful for implementation inheritance when writing an {@link Policy}
+ * be useful for implementation inheritance when writing an {@link org.apache.camel.spi.Policy}
*/
public class DelegateAsyncProcessor extends ServiceSupport implements AsyncProcessor {
protected AsyncProcessor processor;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java Sat Mar 7 08:16:01 2009
@@ -19,12 +19,11 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.spi.Policy;
import org.apache.camel.util.ServiceHelper;
/**
* A Delegate pattern which delegates processing to a nested processor which can
- * be useful for implementation inheritance when writing an {@link Policy}
+ * be useful for implementation inheritance when writing an {@link org.apache.camel.spi.Policy}
*
* @version $Revision$
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java Sat Mar 7 08:16:01 2009
@@ -20,7 +20,6 @@
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
public class ExchangePatternProcessor implements AsyncProcessor {
private ExchangePattern exchangePattern = ExchangePattern.InOnly;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java Sat Mar 7 08:16:01 2009
@@ -17,7 +17,6 @@
package org.apache.camel.processor.aggregate;
import java.util.AbstractCollection;
-import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -28,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
/**
- * A {@link Collection} which aggregates exchanges together using a correlation
+ * A {@link java.util.Collection} which aggregates exchanges together using a correlation
* expression so that there is only a single message exchange sent for a single
* correlation key.
*
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java Sat Mar 7 08:16:01 2009
@@ -24,8 +24,8 @@
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.StreamCache;
-import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.InterceptorDefinition;
+import org.apache.camel.model.InterceptorRef;
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.MessageHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java Sat Mar 7 08:16:01 2009
@@ -17,7 +17,6 @@
package org.apache.camel.processor.loadbalancer;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java Sat Mar 7 08:16:01 2009
@@ -24,10 +24,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spi.Injector;
import org.apache.camel.spi.Language;
-import org.apache.camel.spi.Registry;
import static org.apache.camel.util.ObjectHelper.isEmpty;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
@@ -129,7 +126,7 @@
}
/**
- * Creates a new instance of the given type using the {@link Injector} on the given
+ * Creates a new instance of the given type using the {@link org.apache.camel.spi.Injector} on the given
* {@link CamelContext}
*/
public static <T> T newInstance(CamelContext context, Class<T> beanType) {
@@ -137,7 +134,7 @@
}
/**
- * Look up the given named bean in the {@link Registry} on the
+ * Look up the given named bean in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext}
*/
public static Object lookup(CamelContext context, String name) {
@@ -145,7 +142,7 @@
}
/**
- * Look up the given named bean of the given type in the {@link Registry} on the
+ * Look up the given named bean of the given type in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext}
*/
public static <T> T lookup(CamelContext context, String name, Class<T> beanType) {
@@ -153,7 +150,7 @@
}
/**
- * Look up the given named bean in the {@link Registry} on the
+ * Look up the given named bean in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext} or throws IllegalArgumentException if not found.
*/
public static Object mandatoryLookup(CamelContext context, String name) {
@@ -163,7 +160,7 @@
}
/**
- * Look up the given named bean of the given type in the {@link Registry} on the
+ * Look up the given named bean of the given type in the {@link org.apache.camel.spi.Registry} on the
* {@link CamelContext} or throws IllegalArgumentException if not found.
*/
public static <T> T mandatoryLookup(CamelContext context, String name, Class<T> beanType) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionStringBuffer.java Sat Mar 7 08:16:01 2009
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class CollectionStringBuffer {
- private StringBuffer buffer = new StringBuffer();
+ private final StringBuffer buffer = new StringBuffer();
private String separator;
private boolean first = true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java Sat Mar 7 08:16:01 2009
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java Sat Mar 7 08:16:01 2009
@@ -18,7 +18,6 @@
import java.net.InetAddress;
import java.net.ServerSocket;
-import java.util.logging.Level;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CountingLatch.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CountingLatch.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CountingLatch.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CountingLatch.java Sat Mar 7 08:16:01 2009
@@ -16,13 +16,14 @@
*/
package org.apache.camel.util.concurrent;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.AbstractQueuedSynchronizer;
/**
- * An alternative to a {@link CountDownLatch} -- this implementation also supports incrementing
- * the latch count while counting down. It can also be used to count up to 0 from a negative integer.
+ * An alternative to a {@link java.util.concurrent.CountDownLatch}.
+ * <p/>
+ * This implementation also supports incrementing the latch count while counting down.
+ * It can also be used to count up to 0 from a negative integer.
*/
public class CountingLatch {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java Sat Mar 7 08:16:01 2009
@@ -26,8 +26,8 @@
*/
public class FileConsumeMoveMultipleDirectoriesTest extends ContextTestSupport {
- private String fileUrl = "file://target/multidir/?recursive=true&initialDelay=2000&delay=5000" +
- "&excludeNamePostfix=old&moveExpression=done/${file:name}.old";
+ private String fileUrl = "file://target/multidir/?recursive=true&initialDelay=2000&delay=5000"
+ + "&excludeNamePostfix=old&moveExpression=done/${file:name}.old";
@Override
protected void setUp() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java Sat Mar 7 08:16:01 2009
@@ -52,8 +52,8 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/filelanguage/?excludeNamePostfix=.bak" +
- "&moveExpression=${id}.bak").to("mock:result");
+ from("file://target/filelanguage/?excludeNamePostfix=.bak"
+ + "&moveExpression=${id}.bak").to("mock:result");
}
});
context.start();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java Sat Mar 7 08:16:01 2009
@@ -21,7 +21,6 @@
import java.io.StringReader;
import java.util.LinkedList;
import java.util.List;
-
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
@@ -33,8 +32,8 @@
import org.apache.camel.converter.jaxp.BytesSource;
import org.apache.camel.converter.jaxp.StringSource;
import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.InterceptorDefinition;
+import org.apache.camel.model.InterceptorRef;
import org.apache.camel.processor.DelegateProcessor;
public class StreamCachingInterceptorTest extends ContextTestSupport {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java Sat Mar 7 08:16:01 2009
@@ -32,7 +32,7 @@
public FtpConsumer(RemoteFileEndpoint<FTPFile> endpoint, Processor processor, RemoteFileOperations<FTPFile> fileOperations) {
super(endpoint, processor, fileOperations);
- this.endpointPath = endpoint.getConfiguration().getFile();
+ this.endpointPath = endpoint.getConfiguration().getDirectory();
}
protected void pollDirectory(String fileName, List<GenericFile<FTPFile>> fileList) {
@@ -105,15 +105,18 @@
answer.setLastModified(file.getTimestamp().getTimeInMillis());
}
answer.setHostname(((RemoteFileConfiguration) endpoint.getConfiguration()).getHost());
- // all ftp files is consider as relative
+
+ // all ftp files is considered as relative
answer.setAbsolute(false);
+
+ // create a pseudo absolute name
String absoluteFileName = (ObjectHelper.isNotEmpty(directory) ? directory + "/" : "") + file.getName();
answer.setAbsoluteFileName(absoluteFileName);
- // the relative filename
- String ftpBasePath = endpoint.getConfiguration().getFile();
- String relativePath = absoluteFileName.substring(ftpBasePath.length());
+ // the relative filename, skip the leading endpoint configured path
+ String relativePath = ObjectHelper.after(absoluteFileName, endpointPath);
if (relativePath.startsWith("/")) {
+ // skip trailing /
relativePath = relativePath.substring(1);
}
answer.setRelativeFileName(relativePath);
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java Sat Mar 7 08:16:01 2009
@@ -28,8 +28,11 @@
*/
public class SftpConsumer extends RemoteFileConsumer<ChannelSftp.LsEntry> {
+ private String endpointPath;
+
public SftpConsumer(RemoteFileEndpoint<ChannelSftp.LsEntry> endpoint, Processor processor, RemoteFileOperations<ChannelSftp.LsEntry> operations) {
super(endpoint, processor, operations);
+ this.endpointPath = endpoint.getConfiguration().getDirectory();
}
protected void pollDirectory(String fileName, List<GenericFile<ChannelSftp.LsEntry>> fileList) {
@@ -79,35 +82,48 @@
}
// list the files in the fold and poll the first file
List<ChannelSftp.LsEntry> list = operations.listFiles(fileName);
- ChannelSftp.LsEntry file = list.get(0);
- if (file != null) {
- RemoteFile<ChannelSftp.LsEntry> remoteFile = asRemoteFile(directory, file);
- if (isValidFile(remoteFile, false)) {
- // matched file so add
- fileList.add(remoteFile);
+ if (list.size() > 0) {
+ ChannelSftp.LsEntry file = list.get(0);
+ if (file != null) {
+ RemoteFile<ChannelSftp.LsEntry> remoteFile = asRemoteFile(directory, file);
+ if (isValidFile(remoteFile, false)) {
+ // matched file so add
+ fileList.add(remoteFile);
+ }
+ }
+ } else {
+ if (log.isTraceEnabled()) {
+ log.trace("Polled [" + fileName + "]. No files found");
}
}
}
private RemoteFile<ChannelSftp.LsEntry> asRemoteFile(String directory, ChannelSftp.LsEntry file) {
- RemoteFile<ChannelSftp.LsEntry> remote = new RemoteFile<ChannelSftp.LsEntry>();
- remote.setFile(file);
- remote.setFileName(file.getFilename());
- remote.setFileLength(file.getAttrs().getSize());
- remote.setLastModified(file.getAttrs().getMTime() * 1000L);
- remote.setHostname(((RemoteFileConfiguration) endpoint.getConfiguration()).getHost());
+ RemoteFile<ChannelSftp.LsEntry> answer = new RemoteFile<ChannelSftp.LsEntry>();
+
+ answer.setEndpointPath(endpointPath);
+ answer.setFile(file);
+ answer.setFileName(file.getFilename());
+ answer.setFileLength(file.getAttrs().getSize());
+ answer.setLastModified(file.getAttrs().getMTime() * 1000L);
+ answer.setHostname(((RemoteFileConfiguration) endpoint.getConfiguration()).getHost());
+
+ // all ftp files is considered as relative
+ answer.setAbsolute(false);
+
+ // create a pseudo absolute name
String absoluteFileName = (ObjectHelper.isNotEmpty(directory) ? directory + "/" : "") + file.getFilename();
- remote.setAbsoluteFileName(absoluteFileName);
+ answer.setAbsoluteFileName(absoluteFileName);
- // the relative filename
- String ftpBasePath = endpoint.getConfiguration().getFile();
- String relativePath = absoluteFileName.substring(ftpBasePath.length());
+ // the relative filename, skip the leading endpoint configured path
+ String relativePath = ObjectHelper.after(absoluteFileName, endpointPath);
if (relativePath.startsWith("/")) {
+ // skip trailing /
relativePath = relativePath.substring(1);
}
- remote.setRelativeFileName(relativePath);
+ answer.setRelativeFileName(relativePath);
- return remote;
+ return answer;
}
}
Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java (from r751203, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java&r1=751203&r2=751221&rev=751221&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java Sat Mar 7 08:16:01 2009
@@ -23,16 +23,16 @@
/**
* Unit test based on end user problem with SFTP on Windows
*/
-public class FromFtpMoveFileAbsoluteFolderRecursiveTest extends FtpServerTestSupport {
+public class FromFtpMoveFileToHiddenFolderRecursiveTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&recursive=true&binary=false&excludeNamePostfix=.old"
- + "&moveExpression=/done/${file:name}.old&initialDelay=5000&delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "?password=admin&recursive=true&binary=false"
+ + "&moveExpression=.done/${file:name}&initialDelay=3000&delay=5000";
}
@Override
protected void setUp() throws Exception {
- deleteDirectory(FTP_ROOT_DIR + "movefile");
+ deleteDirectory(FTP_ROOT_DIR);
super.setUp();
prepareFtpServer();
}
@@ -46,9 +46,9 @@
public void testPollFileAndShouldBeMoved() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("Hello", "Bye", "Goodday");
- mock.expectedFileExists(FTP_ROOT_DIR + "done/hello.txt.old");
- mock.expectedFileExists(FTP_ROOT_DIR + "done/bye/bye.txt.old");
- mock.expectedFileExists(FTP_ROOT_DIR + "done/goodday/goodday.txt.old");
+ mock.expectedFileExists(FTP_ROOT_DIR + ".done/hello.txt");
+ mock.expectedFileExists(FTP_ROOT_DIR + ".done/bye/bye.txt");
+ mock.expectedFileExists(FTP_ROOT_DIR + ".done/goodday/goodday.txt");
mock.assertIsSatisfied();
}
Propchange: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java Sat Mar 7 08:16:01 2009
@@ -99,7 +99,7 @@
RemoteFileEndpoint endpoint = resolveMandatoryEndpoint(context, endpointUri, RemoteFileEndpoint.class);
assertNotNull("Could not find endpoint: " + endpointUri, endpoint);
- String file = endpoint.getConfiguration().getFile();
+ String file = endpoint.getConfiguration().getDirectory();
assertEquals("For uri: " + endpointUri + " the file is not equal", expectedFile, file);
}
Modified: camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java?rev=751221&r1=751220&r2=751221&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java (original)
+++ camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java Sat Mar 7 08:16:01 2009
@@ -18,7 +18,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
-import org.apache.camel.Message;
import org.apache.camel.impl.ExpressionSupport;
import org.apache.camel.language.ExpressionEvaluationException;
import org.apache.commons.jxpath.CompiledExpression;
@@ -30,7 +29,7 @@
*/
public class JXPathExpression extends ExpressionSupport {
- private String expression;
+ private final String expression;
private CompiledExpression compiledExpression;
private final Class<?> type;
@@ -69,7 +68,7 @@
@Override
protected String assertionFailureMessage(Exchange exchange) {
- return expression.toString();
+ return expression;
}
/*