svn commit: r936173 - /camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Author: davsclaus
Date: Wed Apr 21 06:32:07 2010
New Revision: 936173
URL: http://svn.apache.org/viewvc?rev=936173&view=rev
Log:
CAMEL-2652: Applied patch with thanks to David Valeri.
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=936173&r1=936172&r2=936173&view=diff
==
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Wed Apr 21 06:32:07 2010
@@ -535,10 +535,9 @@ public class JettyHttpComponent extends
connectorRef.server.stop();
// Camel controls the lifecycle of these entities so remove the
// registered MBeans when Camel is done with the managed
objects.
-MBeanContainer containerToClean = getMbContainer();
-if (containerToClean != null) {
-containerToClean.removeBean(connectorRef.server);
-containerToClean.removeBean(connectorRef.connector);
+if (mbContainer != null) {
+mbContainer.removeBean(connectorRef.server);
+mbContainer.removeBean(connectorRef.connector);
}
}
CONNECTORS.clear();
svn commit: r936167 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
Author: davsclaus
Date: Wed Apr 21 06:16:42 2010
New Revision: 936167
URL: http://svn.apache.org/viewvc?rev=936167&view=rev
Log:
Fixed typo in method name
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java?rev=936167&r1=936166&r2=936167&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
Wed Apr 21 06:16:42 2010
@@ -24,8 +24,8 @@ import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.processor.Logger;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.util.ServiceHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,8 +38,8 @@ import org.apache.commons.logging.LogFac
*/
public class EventDrivenPollingConsumer extends PollingConsumerSupport
implements Processor {
private static final transient Log LOG =
LogFactory.getLog(EventDrivenPollingConsumer.class);
-private BlockingQueue queue;
-private ExceptionHandler interuptedExceptionHandler = new
LoggingExceptionHandler(new Logger(LOG));
+private final BlockingQueue queue;
+private ExceptionHandler interruptedExceptionHandler = new
LoggingExceptionHandler(EventDrivenPollingConsumer.class);
private Consumer consumer;
public EventDrivenPollingConsumer(Endpoint endpoint) {
@@ -60,7 +60,7 @@ public class EventDrivenPollingConsumer
try {
return queue.take();
} catch (InterruptedException e) {
-handleInteruptedException(e);
+handleInterruptedException(e);
}
}
if (LOG.isTraceEnabled()) {
@@ -73,7 +73,7 @@ public class EventDrivenPollingConsumer
try {
return queue.poll(timeout, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
-handleInteruptedException(e);
+handleInterruptedException(e);
return null;
}
}
@@ -82,31 +82,25 @@ public class EventDrivenPollingConsumer
queue.offer(exchange);
}
-public ExceptionHandler getInteruptedExceptionHandler() {
-return interuptedExceptionHandler;
+public ExceptionHandler getInterruptedExceptionHandler() {
+return interruptedExceptionHandler;
}
-public void setInteruptedExceptionHandler(ExceptionHandler
interuptedExceptionHandler) {
-this.interuptedExceptionHandler = interuptedExceptionHandler;
+public void setInterruptedExceptionHandler(ExceptionHandler
interruptedExceptionHandler) {
+this.interruptedExceptionHandler = interruptedExceptionHandler;
}
-protected void handleInteruptedException(InterruptedException e) {
-getInteruptedExceptionHandler().handleException(e);
+protected void handleInterruptedException(InterruptedException e) {
+getInterruptedExceptionHandler().handleException(e);
}
protected void doStart() throws Exception {
// lets add ourselves as a consumer
consumer = getEndpoint().createConsumer(this);
-consumer.start();
+ServiceHelper.startService(consumer);
}
protected void doStop() throws Exception {
-if (consumer != null) {
-try {
-consumer.stop();
-} finally {
-consumer = null;
-}
-}
+ServiceHelper.stopService(consumer);
}
}
svn commit: r936165 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/file/GenericFileConsumer.java test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
Author: davsclaus
Date: Wed Apr 21 06:08:05 2010
New Revision: 936165
URL: http://svn.apache.org/viewvc?rev=936165&view=rev
Log:
CAMEL-2662: Fixed issue if file begin threw exception which cause in progress
file not to be removed from internal cache
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
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=936165&r1=936164&r2=936165&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
Wed Apr 21 06:08:05 2010
@@ -218,6 +218,8 @@ public abstract class GenericFileConsume
// must extract the absolute name before the begin strategy as the
file could potentially be pre moved
// and then the file name would be changed
String absoluteFileName = file.getAbsoluteFilePath();
+
+// check if we can begin processing the file
try {
final GenericFileProcessStrategy processStrategy =
endpoint.getGenericFileProcessStrategy();
@@ -226,17 +228,24 @@ public abstract class GenericFileConsume
if (log.isDebugEnabled()) {
log.debug(endpoint + " cannot begin processing file: " +
file);
}
-// remove file from the in progress list as its no longer in
progress
+// begin returned false, so remove file from the in progress
list as its no longer in progress
endpoint.getInProgressRepository().remove(absoluteFileName);
return;
}
+} catch (Exception e) {
+if (log.isDebugEnabled()) {
+log.debug(endpoint + " cannot begin processing file: " + file
+ " due to: " + e.getMessage(), e);
+}
+endpoint.getInProgressRepository().remove(absoluteFileName);
+return;
+}
-// must use file from exchange as it can be updated due the
-// preMoveNamePrefix/preMoveNamePostfix options
-final GenericFile target = getExchangeFileProperty(exchange);
-// must use full name when downloading so we have the correct path
-final String name = target.getAbsoluteFilePath();
-
+// must use file from exchange as it can be updated due the
+// preMoveNamePrefix/preMoveNamePostfix options
+final GenericFile target = getExchangeFileProperty(exchange);
+// must use full name when downloading so we have the correct path
+final String name = target.getAbsoluteFilePath();
+try {
// retrieve the file using the stream
if (log.isTraceEnabled()) {
log.trace("Retrieving file: " + name + " from: " + endpoint);
@@ -248,18 +257,23 @@ public abstract class GenericFileConsume
log.trace("Retrieved file: " + name + " from: " + endpoint);
}
-if (log.isDebugEnabled()) {
-log.debug("About to process file: " + target + " using
exchange: " + exchange);
-}
-
// register on completion callback that does the completion
strategies
// (for instance to move the file after we have processed it)
exchange.addOnCompletion(new GenericFileOnCompletion(endpoint,
operations, target, absoluteFileName));
+if (log.isDebugEnabled()) {
+log.debug("About to process file: " + target + " using
exchange: " + exchange);
+}
+
// process the exchange
getProcessor().process(exchange);
} catch (Exception e) {
+// remove file from the in progress list due to failure
+// (cannot be in finally block due to GenericFileOnCompletion will
remove it
+// from in progress when it takes over and processes the file,
which may happen
+// by another thread at a later time. So its only safe to remove
it if there was an exception)
+endpoint.getInProgressRepository().remove(absoluteFileName);
handleException(e);
}
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java?rev=936165&view=auto
==
---
camel/trunk/camel-cor
svn commit: r936164 - in /camel/trunk/components/camel-test/src: main/java/org/apache/camel/test/junit4/TestSupport.java test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
Author: davsclaus
Date: Wed Apr 21 06:07:30 2010
New Revision: 936164
URL: http://svn.apache.org/viewvc?rev=936164&view=rev
Log:
Fixed get test name on junit 4.x
Added:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
- copied, changed from r936153,
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=936164&r1=936163&r2=936164&view=diff
==
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Wed Apr 21 06:07:30 2010
@@ -475,7 +475,9 @@ public abstract class TestSupport extend
*
* @return the method name
*/
-public static String getTestMethodName() {
+public String getTestMethodName() {
+// TODO: When using latest junit we can use @Rule to remember the test
name
+//
http://kentbeck.github.com/junit/javadoc/latest/org/junit/rules/TestName.html
return "";
}
Copied:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
(from r936153,
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java?p2=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java&p1=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java&r1=936153&r2=936164&rev=936164&view=diff
==
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
Wed Apr 21 06:07:30 2010
@@ -21,15 +21,18 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+// END SNIPPET: example
/**
* Tests filtering using Camel Test
- *
+ *
* @version $Revision$
*/
// START SNIPPET: example
-public class FilterTest extends CamelTestSupport {
+public class FilterJUnit4Test extends CamelTestSupport {
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
@@ -37,6 +40,7 @@ public class FilterTest extends CamelTes
@Produce(uri = "direct:start")
protected ProducerTemplate template;
+@Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "";
@@ -47,6 +51,7 @@ public class FilterTest extends CamelTes
resultEndpoint.assertIsSatisfied();
}
+@Test
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
@@ -63,5 +68,4 @@ public class FilterTest extends CamelTes
}
};
}
-}
-// END SNIPPET: example
+}
\ No newline at end of file
svn commit: r936162 - in /camel/trunk/components/camel-test/src/main/java/org/apache/camel/test: CamelTestSupport.java TestSupport.java junit4/CamelTestSupport.java junit4/TestSupport.java
Author: davsclaus
Date: Wed Apr 21 05:47:03 2010
New Revision: 936162
URL: http://svn.apache.org/viewvc?rev=936162&view=rev
Log:
Fixed get test name on junit 4.x
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=936162&r1=936161&r2=936162&view=diff
==
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
Wed Apr 21 05:47:03 2010
@@ -80,7 +80,7 @@ public abstract class CamelTestSupport e
@Override
protected void setUp() throws Exception {
log.info("");
-log.info("Testing: " + getName() + "(" + getClass().getName() + ")");
+log.info("Testing: " + getTestMethodName() + "(" +
getClass().getName() + ")");
log.info("");
log.debug("setUp test");
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=936162&r1=936161&r2=936162&view=diff
==
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
Wed Apr 21 05:47:03 2010
@@ -471,4 +471,13 @@ public abstract class TestSupport extend
return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1;
}
+/**
+ * Gets the current test method name
+ *
+ * @return the method name
+ */
+public String getTestMethodName() {
+return getName();
+}
+
}
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=936162&r1=936161&r2=936162&view=diff
==
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
Wed Apr 21 05:47:03 2010
@@ -82,7 +82,7 @@ public abstract class CamelTestSupport e
@Before
public void setUp() throws Exception {
log.info("");
-log.info("Testing: " + getName() + "(" + getClass().getName() + ")");
+log.info("Testing: " + getTestMethodName() + "(" +
getClass().getName() + ")");
log.info("");
log.debug("setUp test");
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=936162&r1=936161&r2=936162&view=diff
==
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Wed Apr 21 05:47:03 2010
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Locale;
-import junit.framework.TestCase;
import org.apache.camel.CamelContext;
import org.apache.camel.Channel;
import org.apache.camel.Endpoint;
@@ -49,7 +48,7 @@ import org.junit.Assert;
*
* @version $Revision$
*/
-public abstract class TestSupport extends TestCase {
+public abstract class TestSupport extends Assert {
private static final Log LOG = LogFactory.getLog(TestSupport.class);
protected transient Log log = LogFactory.getLog(getClass());
@@ -471,4 +470,13 @@ public abstract class TestSupport extend
return javaVendor.indexOf(vendor.toLowerCase(Locale
svn commit: r936137 - /camel/branches/camel-1.x/pom.xml
Author: ningjiang
Date: Wed Apr 21 01:58:21 2010
New Revision: 936137
URL: http://svn.apache.org/viewvc?rev=936137&view=rev
Log:
Updated the plugin configuration of the camel-1.x pom
Modified:
camel/branches/camel-1.x/pom.xml
Modified: camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=936137&r1=936136&r2=936137&view=diff
==
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Wed Apr 21 01:58:21 2010
@@ -256,7 +256,11 @@
org.apache.maven.plugins
maven-eclipse-plugin
- 2.5.1
+ 2.5.1
+
+ true
+ false
+
org.apache.camel
@@ -271,6 +275,12 @@
maven-jetty-plugin
${jetty-version}
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.1.1
+
org.apache.maven.plugins
svn commit: r936136 - in /camel/trunk/components/camel-restlet/src: main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java test/java/org/apache/camel/component/restlet/RestletRouteBui
Author: wtam
Date: Wed Apr 21 01:51:03 2010
New Revision: 936136
URL: http://svn.apache.org/viewvc?rev=936136&view=rev
Log:
Applied patch from Rich Bolen to address [CAMEL-2638] Restlet component is URL
encoding the POST message body. It should encode it based on content-type
request header
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=936136&r1=936135&r2=936136&view=diff
==
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Wed Apr 21 01:51:03 2010
@@ -35,6 +35,7 @@ import org.restlet.data.ChallengeScheme;
import org.restlet.data.CharacterSet;
import org.restlet.data.Form;
import org.restlet.data.MediaType;
+import org.restlet.data.Method;
import org.restlet.data.Request;
import org.restlet.data.Response;
import org.restlet.data.Status;
@@ -105,8 +106,13 @@ public class DefaultRestletBinding imple
// add the body as the key in the form with null value
form.add(body, null);
+MediaType mediaType =
exchange.getIn().getHeader(Exchange.CONTENT_TYPE, MediaType.class);
+if (mediaType == null) {
+mediaType = MediaType.APPLICATION_WWW_FORM;
+}
+
if (LOG.isDebugEnabled()) {
-LOG.debug("Populate Restlet request from exchange body: " + body);
+LOG.debug("Populate Restlet request from exchange body: " + body +
" using media type " + mediaType);
}
// login and password are filtered by header filter strategy
@@ -123,12 +129,19 @@ public class DefaultRestletBinding imple
for (Map.Entry entry :
exchange.getIn().getHeaders().entrySet()) {
if
(!headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(),
entry.getValue(), exchange)) {
-if (entry.getKey().startsWith("org.restlet.")) {
-// put the org.restlet headers in attributes
+// Use forms only for GET and POST/x-www-form-urlencoded
+if (request.getMethod() == Method.GET || (request.getMethod()
== Method.POST && mediaType == MediaType.APPLICATION_WWW_FORM)) {
+if (entry.getKey().startsWith("org.restlet.")) {
+// put the org.restlet headers in attributes
+request.getAttributes().put(entry.getKey(),
entry.getValue());
+} else {
+// put the user stuff in the form
+form.add(entry.getKey(), entry.getValue().toString());
+}
+}
+else {
+// For non-form post put all the headers in attributes
request.getAttributes().put(entry.getKey(),
entry.getValue());
-} else {
-// put the user stuff in the form
-form.add(entry.getKey(), entry.getValue().toString());
}
if (LOG.isDebugEnabled()) {
LOG.debug("Populate Restlet request from exchange header:
"
@@ -137,7 +150,18 @@ public class DefaultRestletBinding imple
}
}
-request.setEntity(form.getWebRepresentation());
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using Content Type: "
++ mediaType + " for POST data: " + body);
+}
+
+// Only URL Encode for GET and form POST
+if (request.getMethod() == Method.GET || (request.getMethod() ==
Method.POST && mediaType == MediaType.APPLICATION_WWW_FORM)) {
+request.setEntity(form.getWebRepresentation());
+}
+else {
+request.setEntity(body, mediaType);
+}
}
public void populateRestletResponseFromExchange(Exchange exchange,
Response response) {
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java?rev=936136&r1=936135&r2=936136&view=diff
==
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/compone
svn commit: r935875 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/processor/aggregate/ components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/ components/camel-jms/src/
Author: davsclaus
Date: Tue Apr 20 11:33:35 2010
New Revision: 935875
URL: http://svn.apache.org/viewvc?rev=935875&view=rev
Log:
Have unit tests class and method name be logged when using camel-test. Fixed
tests on other boxes.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRouteTest.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=935875&r1=935874&r2=935875&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Tue Apr 20 11:33:35 2010
@@ -778,7 +778,7 @@ public class AggregateProcessor extends
// start timeout service if its in use
if (getCompletionTimeout() > 0 || getCompletionTimeoutExpression() !=
null) {
-LOG.info("Using CompletionTimeout to trigger after " +
getCompletionInterval() + " millis of inactivity.");
+LOG.info("Using CompletionTimeout to trigger after " +
getCompletionTimeout() + " millis of inactivity.");
ScheduledExecutorService scheduler =
camelContext.getExecutorServiceStrategy().newScheduledThreadPool(this,
"AggregateTimeoutChecker", 1);
// check for timed out aggregated messages once every second
timeoutMap = new AggregationTimeoutMap(scheduler, 1000L);
Modified:
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java?rev=935875&r1=935874&r2=935875&view=diff
==
---
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
(original)
+++
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
Tue Apr 20 11:33:35 2010
@@ -46,7 +46,7 @@ public class HawtDBAggregateLoadConcurre
@Test
public void testLoadTestHawtDBAggregate() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
-mock.expectedMinimumMessageCount(9);
+mock.expectedMessageCount(10);
mock.setResultWaitTime(30 * 1000);
ExecutorService executor = Executors.newFixedThreadPool(10);
@@ -62,7 +62,7 @@ public class HawtDBAggregateLoadConcurre
if (LOG.isDebugEnabled()) {
LOG.debug("Sending " + value + " with id " + id);
}
-template.sendBodyAndHeader("seda:start?size=" + SIZE,
value, "id", "" + id);
+template.sendBodyAndHeader("direct:start", value, "id", ""
+ id);
return null;
}
});
@@ -80,7 +80,7 @@ public class HawtDBAggregateLoadConcurre
public void configure() throws Exception {
HawtDBAggregationRepository repo = new
HawtDBAggregationRepository("repo1", "target/data/hawtdb.dat");
-from("seda:start?size=" + SIZE)
+from("direct:start")
.to("log:input?groupSize=500")
.aggregate(header("id"), new MyAggregationStrategy())
.aggregationRepository(repo)
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRouteTest.java?rev=935875&r1=935874&r2=935875&view=diff
==
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRouteTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRouteTest.java
Tue Apr 20 11:33:35 2010
@@ -45,8 +45,8 @@ public clas
svn commit: r935833 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Author: davsclaus
Date: Tue Apr 20 08:54:37 2010
New Revision: 935833
URL: http://svn.apache.org/viewvc?rev=935833&view=rev
Log:
Improved shutdown
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
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=935833&r1=935832&r2=935833&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
Tue Apr 20 08:54:37 2010
@@ -1208,7 +1208,11 @@ public class DefaultCamelContext extends
EventHelper.notifyCamelContextStopping(this);
// stop route inputs in the same order as they was started so we stop
the very first inputs first
-shutdownStrategy.shutdown(this, getRouteStartupOrder());
+try {
+shutdownStrategy.shutdown(this, getRouteStartupOrder());
+} catch (Throwable e) {
+LOG.warn("Error occurred while shutting down routes. This
exception will be ignored.", e);
+}
getRouteStartupOrder().clear();
shutdownServices(routeServices.values());
