Author: davsclaus
Date: Tue Jan 27 15:53:52 2009
New Revision: 738115
URL: http://svn.apache.org/viewvc?rev=738115&view=rev
Log:
Fixed failing unit tests reported by team city. Fixed checkstyle errors.
Modified:
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/GenericFileExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
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=738115&r1=738114&r2=738115&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
Tue Jan 27 15:53:52 2009
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.file;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Expression;
import org.apache.camel.Message;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileExchange.java
Tue Jan 27 15:53:52 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file;
import java.util.Date;
-import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewFileLockExclusiveReadLockStrategy.java
Tue Jan 27 15:53:52 2009
@@ -41,8 +41,7 @@
private static final transient Log LOG =
LogFactory.getLog(NewFileLockExclusiveReadLockStrategy.class);
private long timeout;
- public boolean acquireExclusiveReadLock(GenericFileOperations<File>
operations, GenericFile<File> file, Exchange exchange)
- throws Exception {
+ public boolean acquireExclusiveReadLock(GenericFileOperations<File>
operations, GenericFile<File> file, Exchange exchange) throws Exception {
File target = new File(file.getAbsoluteFileName());
if (LOG.isTraceEnabled()) {
@@ -111,8 +110,7 @@
Channel channel = lock.channel();
try {
lock.release();
- }
- finally {
+ } finally {
// must close channel
ObjectHelper.close(channel, "while acquiring exclusive read lock
for file: " + lockFileName, LOG);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/NewMarkerFileExclusiveReadLockStrategy.java
Tue Jan 27 15:53:52 2009
@@ -36,9 +36,10 @@
*
*/
public class NewMarkerFileExclusiveReadLockStrategy implements
GenericFileExclusiveReadLockStrategy<File> {
+ public static final transient String DEFAULT_LOCK_FILE_POSTFIX =
".camelLock";
private static final transient Log LOG =
LogFactory.getLog(NewMarkerFileExclusiveReadLockStrategy.class);
- private GenericFileRenamer lockFileRenamer = new
GenericFileDefaultRenamer("", ".camellock");
+ private GenericFileRenamer lockFileRenamer = new
GenericFileDefaultRenamer("", DEFAULT_LOCK_FILE_POSTFIX);
public boolean acquireExclusiveReadLock(GenericFileOperations<File>
fileGenericFileOperations,
GenericFile<File> file, Exchange
exchange) throws Exception {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
Tue Jan 27 15:53:52 2009
@@ -22,6 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import
org.apache.camel.component.file.strategy.NewMarkerFileExclusiveReadLockStrategy;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -74,9 +75,10 @@
private static void checkLockFile(boolean expected) {
String filename = "target/reports/";
filename += expected ? "locked/" : "notlocked/";
- filename += "report.txt" + FileEndpoint.DEFAULT_LOCK_FILE_POSTFIX;
+ filename += "report.txt" +
NewMarkerFileExclusiveReadLockStrategy.DEFAULT_LOCK_FILE_POSTFIX;
File file = new File(filename);
+ file = file.getAbsoluteFile();
assertEquals("Lock file should " + (expected ? "exists" : "not
exists"), expected, file.exists());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
Tue Jan 27 15:53:52 2009
@@ -17,7 +17,6 @@
package org.apache.camel.language;
import java.io.File;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -27,12 +26,10 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.LanguageTestSupport;
import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.file.FileEndpoint;
-import org.apache.camel.component.file.FileExchange;
-import org.apache.camel.component.file.NewFileEndpoint;
-import org.apache.camel.component.file.GenericFileExchange;
import org.apache.camel.component.file.GenericFile;
+import org.apache.camel.component.file.GenericFileExchange;
import org.apache.camel.component.file.NewFileConsumer;
+import org.apache.camel.component.file.NewFileEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.language.simple.FileLanguage;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=738115&r1=738114&r2=738115&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
Tue Jan 27 15:53:52 2009
@@ -137,7 +137,9 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").to("mock:end");
+ // need a little delay for fast computers being able to process
+ // the exchange in 0 millis and we need to simulate a little
computation time
+ from("direct:start").delay(10).to("mock:end");
}
};
}
