svn commit: r1391331 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Author: davsclaus
Date: Fri Sep 28 06:55:11 2012
New Revision: 1391331
URL: http://svn.apache.org/viewvc?rev=1391331&view=rev
Log:
When shutting down thread pools as fail safe, give them a bit time to shutdown
nicely as they are likely in shutdown process already. Only log the onces that
was really forced.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1391331&r1=1391330&r2=1391331&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Fri Sep 28 06:55:11 2012
@@ -19,8 +19,10 @@ package org.apache.camel.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
@@ -262,28 +264,28 @@ public class DefaultExecutorServiceManag
@Override
public void shutdown(ExecutorService executorService) {
-doShutdown(executorService, 0);
+doShutdown(executorService, 0, false);
}
@Override
public void shutdownGraceful(ExecutorService executorService) {
-doShutdown(executorService, getShutdownAwaitTermination());
+doShutdown(executorService, getShutdownAwaitTermination(), false);
}
@Override
public void shutdownGraceful(ExecutorService executorService, long
shutdownAwaitTermination) {
-doShutdown(executorService, shutdownAwaitTermination);
+doShutdown(executorService, shutdownAwaitTermination, false);
}
-private void doShutdown(ExecutorService executorService, long
shutdownAwaitTermination) {
+private boolean doShutdown(ExecutorService executorService, long
shutdownAwaitTermination, boolean failSafe) {
ObjectHelper.notNull(executorService, "executorService");
+boolean warned = false;
// shutting down a thread pool is a 2 step process. First we try
graceful, and if that fails, then we go more aggressively
// and try shutting down again. In both cases we wait at most the
given shutdown timeout value given
// (total wait could then be 2 x shutdownAwaitTermination, but when we
shutdown the 2nd time we are aggressive and thus
// we ought to shutdown much faster)
if (!executorService.isShutdown()) {
-boolean warned = false;
StopWatch watch = new StopWatch();
LOG.trace("Shutdown of ExecutorService: {} with await termination:
{} millis", executorService, shutdownAwaitTermination);
@@ -325,8 +327,12 @@ public class DefaultExecutorServiceManag
}
}
-// remove reference as its shutdown
-executorServices.remove(executorService);
+// remove reference as its shutdown (do not remove if fail-safe)
+if (!failSafe) {
+executorServices.remove(executorService);
+}
+
+return warned;
}
@Override
@@ -414,18 +420,34 @@ public class DefaultExecutorServiceManag
// as by normal all threads pool should have been shutdown using
proper lifecycle
// by their EIPs, components etc. This is acting as a fail-safe during
shutdown
// of CamelContext itself.
+Set forced = new LinkedHashSet();
if (!executorServices.isEmpty()) {
-LOG.warn("Shutting down {} ExecutorService's which has not been
shutdown properly (acting as fail-safe)", executorServices.size());
+// at first give a bit of time to shutdown nicely as the thread
pool is most likely in the process of being shutdown also
+LOG.debug("Giving time for {} ExecutorService's to shutdown
properly (acting as fail-safe)", executorServices.size());
for (ExecutorService executorService : executorServices) {
-// only log if something goes wrong as we want to shutdown
them all
try {
-doShutdownNow(executorService, true);
+boolean warned = doShutdown(executorService,
getShutdownAwaitTermination(), true);
+// remember the thread pools that was forced to shutdown
(eg warned)
+if (warned) {
+forced.add(executorService);
+}
} catch (Throwable e) {
+// only log if something goes wrong as we want to shutdown
them
svn commit: r1391208 - /camel/trunk/components/camel-ftp/pom.xml
Author: bvahdat Date: Thu Sep 27 20:48:56 2012 New Revision: 1391208 URL: http://svn.apache.org/viewvc?rev=1391208&view=rev Log: Upgraded the test-scoped dependency of camel-ftp to make use of mina 2.0.4. Modified: camel/trunk/components/camel-ftp/pom.xml Modified: camel/trunk/components/camel-ftp/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1391208&r1=1391207&r2=1391208&view=diff == --- camel/trunk/components/camel-ftp/pom.xml (original) +++ camel/trunk/components/camel-ftp/pom.xml Thu Sep 27 20:48:56 2012 @@ -104,11 +104,11 @@ test - + org.apache.mina mina-core - 2.0.0 + 2.0.4 test
svn commit: r1391205 - /camel/trunk/components/camel-jsch/pom.xml
Author: bvahdat
Date: Thu Sep 27 20:43:29 2012
New Revision: 1391205
URL: http://svn.apache.org/viewvc?rev=1391205&view=rev
Log:
Fixed the failed camel-jsch tests on the CI-Server.
Modified:
camel/trunk/components/camel-jsch/pom.xml
Modified: camel/trunk/components/camel-jsch/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/pom.xml?rev=1391205&r1=1391204&r2=1391205&view=diff
==
--- camel/trunk/components/camel-jsch/pom.xml (original)
+++ camel/trunk/components/camel-jsch/pom.xml Thu Sep 27 20:43:29 2012
@@ -82,11 +82,11 @@
${sshd-version}
test
-
+
org.apache.mina
mina-core
- ${mina2-version}
+ 2.0.4
org.bouncycastle
svn commit: r1391174 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/spi/ camel-core/src/main/java/org/apache/camel/util/ camel-core/src/te
Author: bvahdat
Date: Thu Sep 27 19:26:42 2012
New Revision: 1391174
URL: http://svn.apache.org/viewvc?rev=1391174&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/jndi/JndiCamelSingletonInitialContextFactoryTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CamelContextAwareTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=1391174&r1=1391173&r2=1391174&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
Thu Sep 27 19:26:42 2012
@@ -26,7 +26,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.PollingConsumerPollingStrategy;
import org.apache.camel.Processor;
-import org.apache.camel.StatefulService;
import org.apache.camel.SuspendableService;
import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java?rev=1391174&r1=1391173&r2=1391174&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
Thu Sep 27 19:26:42 2012
@@ -19,7 +19,6 @@ package org.apache.camel.spi;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
import org.apache.camel.ShutdownableService;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=1391174&r1=1391173&r2=1391174&view=diff
==
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
Thu Sep 27 19:26:42 2012
@@ -384,7 +384,6 @@ public final class FileUtil {
return renamed;
}
-@SuppressWarnings("resource")
public static void copyFile(File from, File to) throws IOException {
FileChannel in = new FileInputStream(from).getChannel();
FileChannel out = new FileOutputStream(to).getChannel();
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=1391174&r1=1391173&r2=1391174&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
Thu Sep 27 19:26:42 2012
@@ -95,7 +95,6 @@ public final class URISupport {
* @return the parameters, or an empty map if no parameters (eg never null)
* @throws URISyntaxException is thrown if uri has invalid syntax.
*/
-@SuppressWarnings("unchecked")
public static Map parseQuery(String uri) throws
URISyntaxException {
// must check for trailing & as the uri.split("&") will ignore those
if (uri != null && uri.endsWith("&")) {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java?rev=1391174&r1=1391173&r2=1
svn commit: r1391170 - in /camel/trunk/components/camel-sjms: ./ src/test/java/org/apache/camel/component/sjms/tx/
Author: sully6768
Date: Thu Sep 27 19:22:26 2012
New Revision: 1391170
URL: http://svn.apache.org/viewvc?rev=1391170&view=rev
Log:
Updated batch transaction tests to allow for a slower environment
Modified:
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
Modified: camel/trunk/components/camel-sjms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1391170&r1=1391169&r2=1391170&view=diff
==
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Thu Sep 27 19:22:26 2012
@@ -130,19 +130,17 @@
1.6
1.6
-
+
-org.apache.maven.plugins
maven-surefire-plugin
-2.8
pertest
-Xmx512M
-
-
**/BatchTransactedConcurrentMultipleConsumerTest.*
-
**/BatchTransactedConcurrentMultipleRouteConsumersTest.*
-
**/TransactedConcurrentConsumersTest.*
-
+
+
+
+
+
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java?rev=1391170&r1=1391169&r2=1391170&view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
Thu Sep 27 19:22:26 2012
@@ -33,10 +33,12 @@ import org.junit.Test;
*/
public class BatchTransactedConcurrentMultipleConsumerTest extends
CamelTestSupport {
-private static final int BATCH_COUNT = 25;
+private static final int BATCH_COUNT = 10;
private static final int CONSUMER_COUNT = 2;
-private static final int MAX_ATTEMPTS_COUNT = 50;
-private static final int MESSAGE_COUNT = 200;
+private static final int MAX_ATTEMPTS_COUNT = 10;
+private static final int MESSAGE_COUNT = 20;
+private static final int TOTAL_REDELIVERED_FALSE = 19;
+private static final int TOTAL_REDELIVERED_TRUE = 5;
private static final String BROKER_URI =
"vm://btcmcTestBroker?broker.persistent=false&broker.useJmx=true";
/**
@@ -48,8 +50,8 @@ public class BatchTransactedConcurrentMu
@Test
public void testEndpointConfiguredBatchTransaction() throws Exception {
-
getMockEndpoint("mock:test.redelivered.false").expectedMessageCount(175);
-getMockEndpoint("mock:test.redelivered.true").expectedMessageCount(25);
+
getMockEndpoint("mock:test.redelivered.false").expectedMessageCount(TOTAL_REDELIVERED_FALSE);
+
getMockEndpoint("mock:test.redelivered.true").expectedMessageCount(TOTAL_REDELIVERED_TRUE);
// We should never see a message appear in this endpoint or we
// have problem with our JMS provider
@@ -61,7 +63,8 @@ public class BatchTransactedConcurrentMu
template.sendBody("direct:start", message);
log.trace("Sending message: {}", message);
}
-assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+Thread.sleep(3000);
+assertMockEndpointsSatisfied(5, TimeUnit.SECONDS);
}
@@ -105,12 +108,6 @@ public class BatchTransactedConcurrentMu
.to("mock:test.redelivered.false")
// Now process again any messages that were redelivered
.when(header("JMSRedelivered").isEqualTo("true"))
-.process(new Processor() {
-@Override
-public void process(Exchange exchange) throws
Exception {
-log.info("Retry processing attempt. Continue
processing the message.");
-}
-})
.log("2nd attempt Body: ${body} | Redeliverd:
${header.JMSRedelivered}")
.to("mock:test.redelivered.true")
.otherwise()
Modified:
camel/trunk/co
svn commit: r833196 - in /websites/production/camel/content: cache/main.pageCache stream-caching.html
Author: buildbot
Date: Thu Sep 27 18:17:30 2012
New Revision: 833196
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/stream-caching.html
Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.
Modified: websites/production/camel/content/stream-caching.html
==
--- websites/production/camel/content/stream-caching.html (original)
+++ websites/production/camel/content/stream-caching.html Thu Sep 27 18:17:30
2012
@@ -170,7 +170,7 @@ from("jbi:servi
When stream cache is enabled it will by default spool big streams to files
instead of keeping them in memory. The default threshold is 64kb but you can
configure it with the following properties:
- Property Default Description CamelCachedOutputStreamThreshold 64kb Size in bytes when the stream should be spooled to disk
instead of keeping in memory. Use a value of 0 or negative to disable it all
together so streams is always kept in memory regardless of their size.
CamelCachedOutputStreamOutputDirectory java.io.tmpdir Base directory where temporary files for spooled streams
should be stored.
+ Property Default Description CamelCachedOutputStreamBufferSize 2kb Size in bytes of the buffer used in the stream.
CamelCachedOutputStreamThreshold 64kb Size in bytes when the stream should be spooled to disk
instead of keeping in memory. Use a value of 0 or negative to disable it all
together so streams is always kept in memory regardless of their size.
CamelCachedOutputS
treamOutputDirectory
java.io.tmpdir Base
directory where temporary files for spooled streams should be stored.
@@ -180,6 +180,7 @@ from("jbi:servi
context.getProperties().put(CachedOutputStream.TEMP_DIR, "/tmp/cachedir");
context.getProperties().put(CachedOutputStream.THRESHOLD, "1024");
+context.getProperties().put(CachedOutputStream.BUFFER_SIZE, "4096");
[CONF] Apache Camel > Stream caching
Stream caching
Page edited by Jonathan Anstey
Changes (2)
...
|| Property || Default || Description ||
| CamelCachedOutputStreamBufferSize | 2kb | Size in bytes of the buffer used in the stream. |
| CamelCachedOutputStreamThreshold | 64kb | Size in bytes when the stream should be spooled to disk instead of keeping in memory. Use a value of 0 or negative to disable it all together so streams is always kept in memory regardless of their size. | | CamelCachedOutputStreamOutputDirectory | java.io.tmpdir | Base directory where temporary files for spooled streams should be stored. |
...
context.getProperties().put(CachedOutputStream.TEMP_DIR, "/tmp/cachedir"); context.getProperties().put(CachedOutputStream.THRESHOLD, "1024");
context.getProperties().put(CachedOutputStream.BUFFER_SIZE, "4096");
{code}
...
Full Content
Stream caching
While stream types (like StreamSource, InputStream and Reader) are commonly used in messaging for performance reasons, they also have an important drawback: they can only be read once. In order to be able to work with message content multiple times, the stream needs to be cached.
Streams are caching in memory. In Camel 2.0, large stream messages (over 64 Kb) will be cached in a temporary file instead – Camel itself will handle deleting the temporary file once the cached stream is no longer necessary.
In Camel 2.0 stream cache is default disabled out of the box.
In Camel 1.x stream cache is default enabled out of the box.
StreamCache Affects your payload objectThe StreamCache will affect your payload object as it will replace the Stream payload with a org.apache.camel.StreamCache object.
This StreamCache is capable of being re-readable and thus possible to better be routed within Camel using redelivery or Content Based Router or the likes.
However to not change the payload under the covers without the end user really knowing we changed the default in Camel 2.0 to disabled. So in Camel 2.0 you have to explicit enable it if you want to use it.
Enabling stream caching
In Apache Camel, you can explicitly enable stream caching for a single route with the streamCaching DSL method:
from("jbi:service:http://foo.bar.org/MyService")
.streamCaching()
.to("jbi:service:http://foo.bar.org/MyOtherService");
In Spring XML you enable it by setting the streamCache="true" attribute on the route tag.
"true">
"jbi:service:http://foo.bar.org/MyService"/>
"jbi:service:http://foo.bar.org/MyOtherService"/>
Scopes
StreamCache supports the global and per route scope. So by setting the streamCache attribute on camelContext you can enable/disable it globally.
"true">
...
The route scope is configured by the streamCache attribute on the tag such as:
"true">
"jbi:service:http://foo.bar.org/MyService"/>
"jbi:service:http://foo.bar.org/MyOtherService"/>
You can mix and match for instance you can enable it globally and disable it on a particular route such as:
"true">
"jbi:service:http://foo.bar.org/MyService"/>
"jbi:service:http://foo.bar.org/MyOtherService"/>
"false">
"jms:queue:foo"/>
"jms:queue:bar"/>
Enabling from Java DSL
In Camel 2.0 you can enable stream cache by setting the property on CamelContext, for instance in a RouteBuilder class:
context.setStreamCache(true);
from("jbi:service:http://foo.bar.org/MyService")
.to("jbi:service:http://foo.bar.org/MyOtherService");
Implicitly enabled for multicast and dead letter channel (Camel 1.x)
Some EIPs require that the message content can be read multiple times. Stream caching will be automatically enabled when using these EIPs in your routes:
Multicast will implicitly cache streams to ensure that all the endpoints can access the message content
Dead Letter Channel uses stream caching to ensure that the message content can actually be read again when redelivering a message
Streaming cache to files
When stream cache is enabled it will by default spool big streams to files instead of keeping them in memory. The default threshold is 64kb but you can configure it with the following properties:
Property
Default
Description
CamelCachedOutputStreamBufferSize
2kb
Size in bytes of the buffer used in the stream.
CamelCachedOutputStreamThreshold
64kb
Size in bytes when the stream should be spooled to disk instead of keeping in memory. Use a value of 0 or negative to disable it all together so streams is always kept in memory regardless of their size.
CamelCachedOutputStreamOutputDirectory
java.io.tmpdir
Base directory where temporary files for spooled streams should be stored.
You set these properties on
svn commit: r1391135 - in /camel/branches/camel-2.8.x/camel-core/src: main/java/org/apache/camel/converter/stream/CachedOutputStream.java test/java/org/apache/camel/converter/stream/CachedOutputStream
Author: janstey
Date: Thu Sep 27 17:42:31 2012
New Revision: 1391135
URL: http://svn.apache.org/viewvc?rev=1391135&view=rev
Log:
CAMEL-5659 - Make the buffer size in CachedOutputStream configurable
Conflicts:
camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java?rev=1391135&r1=1391134&r2=1391135&view=diff
==
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Thu Sep 27 17:42:31 2012
@@ -44,16 +44,18 @@ import org.slf4j.LoggerFactory;
*/
public class CachedOutputStream extends OutputStream {
public static final String THRESHOLD = "CamelCachedOutputStreamThreshold";
+public static final String BUFFER_SIZE =
"CamelCachedOutputStreamBufferSize";
public static final String TEMP_DIR =
"CamelCachedOutputStreamOutputDirectory";
private static final transient Logger LOG =
LoggerFactory.getLogger(CachedOutputStream.class);
-private OutputStream currentStream = new ByteArrayOutputStream(2048);
+private OutputStream currentStream;
private boolean inMemory = true;
private int totalLength;
private File tempFile;
private FileInputStreamCache fileInputStreamCache;
private long threshold = 64 * 1024;
+private int bufferSize = 2 * 1024;
private File outputDir;
public CachedOutputStream(Exchange exchange) {
@@ -61,14 +63,21 @@ public class CachedOutputStream extends
}
public CachedOutputStream(Exchange exchange, boolean closedOnCompletion) {
+String bufferSize =
exchange.getContext().getProperties().get(BUFFER_SIZE);
String hold = exchange.getContext().getProperties().get(THRESHOLD);
String dir = exchange.getContext().getProperties().get(TEMP_DIR);
+
+if (bufferSize != null) {
+this.bufferSize =
exchange.getContext().getTypeConverter().convertTo(Integer.class, bufferSize);
+}
if (hold != null) {
this.threshold =
exchange.getContext().getTypeConverter().convertTo(Long.class, hold);
}
if (dir != null) {
this.outputDir =
exchange.getContext().getTypeConverter().convertTo(File.class, dir);
}
+
+currentStream = new ByteArrayOutputStream(this.bufferSize);
if (closedOnCompletion) {
// add on completion so we can cleanup after the exchange is done
such as deleting temporary files
@@ -164,7 +173,6 @@ public class CachedOutputStream extends
return new WrappedInputStream(this, getInputStream());
}
-
public StreamCache getStreamCache() throws IOException {
flush();
@@ -215,6 +223,10 @@ public class CachedOutputStream extends
}
}
+public int getBufferSize() {
+return bufferSize;
+}
+
// This class will close the CachedOutputStream when it is closed
private class WrappedInputStream extends InputStream {
private CachedOutputStream cachedOutputStream;
Modified:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java?rev=1391135&r1=1391134&r2=1391135&view=diff
==
---
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Thu Sep 27 17:42:31 2012
@@ -17,7 +17,10 @@
package org.apache.camel.converter.stream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -152,4 +155,34 @@ public class CachedOutputStreamTest exte
exchange.getUnitOfWork().done(exchange);
}
+
+public void testCachedOutputStreamCustomBufferSize() throws IOException {
+// double the default buffer size
+
svn commit: r1391134 - /camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Author: janstey
Date: Thu Sep 27 17:38:27 2012
New Revision: 1391134
URL: http://svn.apache.org/viewvc?rev=1391134&view=rev
Log:
Fix compile error. shutdownExecutorService flag didn't exist in 2.9
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391134&r1=1391133&r2=1391134&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Thu Sep 27 17:38:27 2012
@@ -176,7 +176,7 @@ public class RecipientList extends Servi
camelContext.removeService(producerCache);
ServiceHelper.stopAndShutdownService(producerCache);
-if (shutdownExecutorService && executorService != null) {
+if (executorService != null) {
camelContext.getExecutorServiceManager().shutdownNow(executorService);
}
}
svn commit: r1391133 - in /camel/branches/camel-2.9.x/camel-core/src: main/java/org/apache/camel/converter/stream/CachedOutputStream.java test/java/org/apache/camel/converter/stream/CachedOutputStream
Author: janstey
Date: Thu Sep 27 17:38:17 2012
New Revision: 1391133
URL: http://svn.apache.org/viewvc?rev=1391133&view=rev
Log:
CAMEL-5659 - Make the buffer size in CachedOutputStream configurable
Conflicts:
camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java?rev=1391133&r1=1391132&r2=1391133&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Thu Sep 27 17:38:17 2012
@@ -44,16 +44,18 @@ import org.slf4j.LoggerFactory;
*/
public class CachedOutputStream extends OutputStream {
public static final String THRESHOLD = "CamelCachedOutputStreamThreshold";
+public static final String BUFFER_SIZE =
"CamelCachedOutputStreamBufferSize";
public static final String TEMP_DIR =
"CamelCachedOutputStreamOutputDirectory";
private static final transient Logger LOG =
LoggerFactory.getLogger(CachedOutputStream.class);
-private OutputStream currentStream = new ByteArrayOutputStream(2048);
+private OutputStream currentStream;
private boolean inMemory = true;
private int totalLength;
private File tempFile;
private FileInputStreamCache fileInputStreamCache;
private long threshold = 64 * 1024;
+private int bufferSize = 2 * 1024;
private File outputDir;
public CachedOutputStream(Exchange exchange) {
@@ -61,14 +63,21 @@ public class CachedOutputStream extends
}
public CachedOutputStream(Exchange exchange, boolean closedOnCompletion) {
+String bufferSize =
exchange.getContext().getProperties().get(BUFFER_SIZE);
String hold = exchange.getContext().getProperties().get(THRESHOLD);
String dir = exchange.getContext().getProperties().get(TEMP_DIR);
+
+if (bufferSize != null) {
+this.bufferSize =
exchange.getContext().getTypeConverter().convertTo(Integer.class, bufferSize);
+}
if (hold != null) {
this.threshold =
exchange.getContext().getTypeConverter().convertTo(Long.class, hold);
}
if (dir != null) {
this.outputDir =
exchange.getContext().getTypeConverter().convertTo(File.class, dir);
}
+
+currentStream = new ByteArrayOutputStream(this.bufferSize);
if (closedOnCompletion) {
// add on completion so we can cleanup after the exchange is done
such as deleting temporary files
@@ -164,7 +173,6 @@ public class CachedOutputStream extends
return new WrappedInputStream(this, getInputStream());
}
-
public StreamCache getStreamCache() throws IOException {
flush();
@@ -215,6 +223,10 @@ public class CachedOutputStream extends
}
}
+public int getBufferSize() {
+return bufferSize;
+}
+
// This class will close the CachedOutputStream when it is closed
private static class WrappedInputStream extends InputStream {
private CachedOutputStream cachedOutputStream;
Modified:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java?rev=1391133&r1=1391132&r2=1391133&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Thu Sep 27 17:38:17 2012
@@ -17,7 +17,10 @@
package org.apache.camel.converter.stream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -152,4 +155,34 @@ public class CachedOutputStreamTest exte
exchange.getUnitOfWork().done(exchange);
}
+
+public void testCachedOutputStreamCustomBufferSize() throws IOException {
+// double the default buffer
svn commit: r1391115 - in /camel/branches/camel-2.10.x/camel-core/src: main/java/org/apache/camel/converter/stream/CachedOutputStream.java test/java/org/apache/camel/converter/stream/CachedOutputStrea
Author: janstey
Date: Thu Sep 27 17:25:13 2012
New Revision: 1391115
URL: http://svn.apache.org/viewvc?rev=1391115&view=rev
Log:
CAMEL-5659 - Make the buffer size in CachedOutputStream configurable
Conflicts:
camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java?rev=1391115&r1=1391114&r2=1391115&view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Thu Sep 27 17:25:13 2012
@@ -44,16 +44,18 @@ import org.slf4j.LoggerFactory;
*/
public class CachedOutputStream extends OutputStream {
public static final String THRESHOLD = "CamelCachedOutputStreamThreshold";
+public static final String BUFFER_SIZE =
"CamelCachedOutputStreamBufferSize";
public static final String TEMP_DIR =
"CamelCachedOutputStreamOutputDirectory";
private static final transient Logger LOG =
LoggerFactory.getLogger(CachedOutputStream.class);
-private OutputStream currentStream = new ByteArrayOutputStream(2048);
+private OutputStream currentStream;
private boolean inMemory = true;
private int totalLength;
private File tempFile;
private FileInputStreamCache fileInputStreamCache;
private long threshold = 64 * 1024;
+private int bufferSize = 2 * 1024;
private File outputDir;
public CachedOutputStream(Exchange exchange) {
@@ -61,14 +63,21 @@ public class CachedOutputStream extends
}
public CachedOutputStream(Exchange exchange, boolean closedOnCompletion) {
+String bufferSize =
exchange.getContext().getProperties().get(BUFFER_SIZE);
String hold = exchange.getContext().getProperties().get(THRESHOLD);
String dir = exchange.getContext().getProperties().get(TEMP_DIR);
+
+if (bufferSize != null) {
+this.bufferSize =
exchange.getContext().getTypeConverter().convertTo(Integer.class, bufferSize);
+}
if (hold != null) {
this.threshold =
exchange.getContext().getTypeConverter().convertTo(Long.class, hold);
}
if (dir != null) {
this.outputDir =
exchange.getContext().getTypeConverter().convertTo(File.class, dir);
}
+
+currentStream = new ByteArrayOutputStream(this.bufferSize);
if (closedOnCompletion) {
// add on completion so we can cleanup after the exchange is done
such as deleting temporary files
@@ -164,7 +173,6 @@ public class CachedOutputStream extends
return new WrappedInputStream(this, getInputStream());
}
-
public StreamCache getStreamCache() throws IOException {
flush();
@@ -215,6 +223,10 @@ public class CachedOutputStream extends
}
}
+public int getBufferSize() {
+return bufferSize;
+}
+
// This class will close the CachedOutputStream when it is closed
private static class WrappedInputStream extends InputStream {
private CachedOutputStream cachedOutputStream;
Modified:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java?rev=1391115&r1=1391114&r2=1391115&view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Thu Sep 27 17:25:13 2012
@@ -17,7 +17,10 @@
package org.apache.camel.converter.stream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -152,4 +155,34 @@ public class CachedOutputStreamTest exte
exchange.getUnitOfWork().done(exchange);
}
+
+public void testCachedOutputStreamCustomBufferSize() throws IOException {
+// double the def
svn commit: r1391106 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/converter/stream/CachedOutputStream.java test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Author: janstey
Date: Thu Sep 27 17:15:29 2012
New Revision: 1391106
URL: http://svn.apache.org/viewvc?rev=1391106&view=rev
Log:
CAMEL-5659 - Make the buffer size in CachedOutputStream configurable
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java?rev=1391106&r1=1391105&r2=1391106&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
Thu Sep 27 17:15:29 2012
@@ -44,16 +44,18 @@ import org.slf4j.LoggerFactory;
*/
public class CachedOutputStream extends OutputStream {
public static final String THRESHOLD = "CamelCachedOutputStreamThreshold";
+public static final String BUFFER_SIZE =
"CamelCachedOutputStreamBufferSize";
public static final String TEMP_DIR =
"CamelCachedOutputStreamOutputDirectory";
private static final transient Logger LOG =
LoggerFactory.getLogger(CachedOutputStream.class);
-private OutputStream currentStream = new ByteArrayOutputStream(2048);
+private OutputStream currentStream;
private boolean inMemory = true;
private int totalLength;
private File tempFile;
private FileInputStreamCache fileInputStreamCache;
private long threshold = 64 * 1024;
+private int bufferSize = 2 * 1024;
private File outputDir;
public CachedOutputStream(Exchange exchange) {
@@ -61,14 +63,21 @@ public class CachedOutputStream extends
}
public CachedOutputStream(Exchange exchange, boolean closedOnCompletion) {
+String bufferSize = exchange.getContext().getProperty(BUFFER_SIZE);
String hold = exchange.getContext().getProperty(THRESHOLD);
String dir = exchange.getContext().getProperty(TEMP_DIR);
+
+if (bufferSize != null) {
+this.bufferSize =
exchange.getContext().getTypeConverter().convertTo(Integer.class, bufferSize);
+}
if (hold != null) {
this.threshold =
exchange.getContext().getTypeConverter().convertTo(Long.class, hold);
}
if (dir != null) {
this.outputDir =
exchange.getContext().getTypeConverter().convertTo(File.class, dir);
}
+
+currentStream = new ByteArrayOutputStream(this.bufferSize);
if (closedOnCompletion) {
// add on completion so we can cleanup after the exchange is done
such as deleting temporary files
@@ -164,7 +173,6 @@ public class CachedOutputStream extends
return new WrappedInputStream(this, getInputStream());
}
-
public StreamCache getStreamCache() throws IOException {
flush();
@@ -215,6 +223,10 @@ public class CachedOutputStream extends
}
}
+public int getBufferSize() {
+return bufferSize;
+}
+
// This class will close the CachedOutputStream when it is closed
private static class WrappedInputStream extends InputStream {
private CachedOutputStream cachedOutputStream;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java?rev=1391106&r1=1391105&r2=1391106&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
Thu Sep 27 17:15:29 2012
@@ -17,7 +17,10 @@
package org.apache.camel.converter.stream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -152,4 +155,34 @@ public class CachedOutputStreamTest exte
exchange.getUnitOfWork().done(exchange);
}
+
+public void testCachedOutputStreamCustomBufferSize() throws IOException {
+// double the default buffer size
+context.getProperties().put(CachedOutputStream.BUFFER_SIZE, "4096");
+
+CachedOutputStream cos = new CachedOutputStream(exchange);
+cos.write(TEST_STRING.getBytes("UTF-8"));
+
+assertEquals("we should have a custom buffer size",
co
svn commit: r833184 - in /websites/production/camel/content: cache/main.pageCache camel-2110-release.html
Author: buildbot Date: Thu Sep 27 16:17:30 2012 New Revision: 833184 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2110-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2110-release.html == --- websites/production/camel/content/camel-2110-release.html (original) +++ websites/production/camel/content/camel-2110-release.html Thu Sep 27 16:17:30 2012 @@ -124,7 +124,7 @@ API changes/breaking -HL7 upgraded to now use Apache Mina 2.x.Renamed org.apache.camel.component.hbase.HBaseContats to org.apache.camel.component.hbase.HBaseConstantsAdded getter/setter methods for loadStatisticsEnabled on org.apache.camel.spi.ManagementStrategyAdded shutdownGraceful, and awaitTermination methods to ExecutorServiceManager to make it easier to shutdown a thread pool gracefully waiting for its tasks to complete.Added method useRawUri() to org.apache.camel.Component to allow Components to use raw uri when creating endpoints. (by default the uri has been encoded prior to creation). +HL7 upgraded to now use Apache Mina 2.x.Renamed org.apache.camel.component.hbase.HBaseContats to org.apache.camel.component.hbase.HBaseConstantsAdded getter/setter methods for loadStatisticsEnabled on org.apache.camel.spi.ManagementStrategyAdded shutdownGraceful, and awaitTermination methods to ExecutorServiceManager to make it easier to shutdown a thread pool gracefully waiting for its tasks to complete.Added method useRawUri() to org.apache.camel.Component to allow Components to use raw uri when creating endpoints. (by default the uri has been encoded prior to creation).Added method newThread to org.apache.camel.spi.ExecutorServiceManager to create a new thread without using a thread pool. Internal/Non API refactorings that may affect users @@ -139,7 +139,7 @@ Dependency Upgrades -Async Http Client 1.7.5 to 1.7.6Axiom 1.2.10 to 1.2.12AWS 1.3.10 to 1.3.14BeanIO 2.0.0 to 2.0.1Commons Exec 1.0.1 to 1.1ConcurrentLinkedHashMap 1.2 to 1.3.1Ehcache bundle 2.5.1 to 2.6.0Groovy 1.8.6 to 2.0.2GSon 2.1 to 2.2.2Hazelcast 2.0.2 to 2.3HTTP Client 4.1.3 to 4.2.1Icu4j 4.0.1 to 4.8.1.1Jackson 1.9.7 to 1.9.9Jaxen 1.1.3 to 1.1.4Jettison 1.3.1 to 1.3.2Jetty 7.5.4 to 7.6.7JRuby 1.6.7 to 1.6.7.2JT400 6.0 to 6.7Krati 0.4.5 to 0.4.6Lucene 3.6.0 to 3.6.1Netty 3.5.1 to 3.5.7Ognl bundle 3.0.4_1 to 3.0.5_1Pax Logging 1.5.3 to 1.6.10QPid 0.16 to 0.18Quartz 1.8.5 to 1.8.6Restlet 2.0.14 to 2.0.15Scala 2.9.1 to 2.9.2Saxon 9.3.0.11 to 9.4.0.1Shiro 1.2.0 to 1.2.1Solr 3.6.0 to 3.6.1Spring Framework 3.1.1 to 3.1.2 Spring Integration 2.1.2 to 2.1.3SSHD 0.6.0 to 0.7.0TestNG 6.0.1 to 6.7Woodstox 4.1.2 to 4.1.3XStream 1.4.2 to 1.4.3 +Async Http Client 1.7.5 to 1.7.6Axiom 1.2.10 to 1.2.12AWS 1.3.10 to 1.3.14BeanIO 2.0.0 to 2.0.1Commons Exec 1.0.1 to 1.1ConcurrentLinkedHashMap 1.2 to 1.3.1Ehcache bundle 2.5.1 to 2.6.0Groovy 1.8.6 to 2.0.4GSon 2.1 to 2.2.2Hazelcast 2.0.2 to 2.3HTTP Client 4.1.3 to 4.2.1Icu4j 4.0.1 to 4.8.1.1Jackson 1.9.7 to 1.9.9Jaxen 1.1.3 to 1.1.4Jettison 1.3.1 to 1.3.2Jetty 7.5.4 to 7.6.7JRuby 1.6.7 to 1.6.7.2JT400 6.0 to 6.7Krati 0.4.5 to 0.4.6Lucene 3.6.0 to 3.6.1Mina 2.0.4 to 2.0.5Netty 3.5.1 to 3.5.7Ognl bundle 3.0.4_1 to 3.0.5_1Pax Logging 1.5.3 to 1.6.10QPid 0.16 to 0.18Quartz 1.8.5 to 1.8.6Restlet 2.0.14 to 2.0.15Scala 2.9.1 to 2.9.2Saxon 9.3.0.11 to 9.4.0.1Shiro 1.2.0 to 1.2.1Solr 3.6.0 to 3.6.1Spr ing Framework 3.1.1 to 3.1.2Spring Integration 2.1.2 to 2.1.3SSHD 0.6.0 to 0.7.0TestNG 6.0.1 to 6.7Woodstox 4.1.2 to 4.1.3XStream 1.4.2 to 1.4.3 Important changes to consider when upgrading
svn commit: r1391076 - /camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
Author: davsclaus
Date: Thu Sep 27 16:09:15 2012
New Revision: 1391076
URL: http://svn.apache.org/viewvc?rev=1391076&view=rev
Log:
Made test cleanup nicely
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java?rev=1391076&r1=1391075&r2=1391076&view=diff
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
Thu Sep 27 16:09:15 2012
@@ -22,7 +22,9 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
+import org.apache.camel.PollingConsumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ConsumerCache;
@@ -40,7 +42,9 @@ public class ManagedConsumerCacheTest ex
template.sendBody("direct:start", "Hello World");
-Exchange out =
cache.getConsumer(context.getEndpoint("seda:queue")).receive(3000);
+Endpoint endpoint = context.getEndpoint("seda:queue");
+PollingConsumer consumer = cache.getConsumer(endpoint);
+Exchange out = consumer.receive(3000);
assertNotNull("Should got an exchange", out);
assertEquals("Hello World", out.getIn().getBody());
@@ -73,6 +77,11 @@ public class ManagedConsumerCacheTest ex
current = (Integer) mbeanServer.getAttribute(on, "Size");
assertEquals(0, current.intValue());
+
+// stop the consumer as it was purged from the cache
+// so we need to manually stop it
+consumer.stop();
+cache.stop();
}
@Override
svn commit: r1391062 - in /camel/trunk/components/camel-sjms: ./ src/test/java/org/apache/camel/component/sjms/tx/
Author: sully6768
Date: Thu Sep 27 15:50:53 2012
New Revision: 1391062
URL: http://svn.apache.org/viewvc?rev=1391062&view=rev
Log:
Disabling batch transaction concurrent tests
Modified:
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
Modified: camel/trunk/components/camel-sjms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1391062&r1=1391061&r2=1391062&view=diff
==
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Thu Sep 27 15:50:53 2012
@@ -132,10 +132,17 @@
+org.apache.maven.plugins
maven-surefire-plugin
+2.8
pertest
-Xmx512M
+
+
**/BatchTransactedConcurrentMultipleConsumerTest.*
+
**/BatchTransactedConcurrentMultipleRouteConsumersTest.*
+
**/TransactedConcurrentConsumersTest.*
+
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java?rev=1391062&r1=1391061&r2=1391062&view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
Thu Sep 27 15:50:53 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -36,6 +37,7 @@ public class BatchTransactedConcurrentMu
private static final int CONSUMER_COUNT = 2;
private static final int MAX_ATTEMPTS_COUNT = 50;
private static final int MESSAGE_COUNT = 200;
+private static final String BROKER_URI =
"vm://btcmcTestBroker?broker.persistent=false&broker.useJmx=true";
/**
* Verify that the batch transactions behave correctly when we combine it
@@ -59,7 +61,7 @@ public class BatchTransactedConcurrentMu
template.sendBody("direct:start", message);
log.trace("Sending message: {}", message);
}
-assertMockEndpointsSatisfied();
+assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
}
@@ -67,7 +69,7 @@ public class BatchTransactedConcurrentMu
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
-ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(BROKER_URI);
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java?rev=1391062&r1=1391061&r2=1391062&view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
Thu Sep 27 15:50:53 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -37,6 +38,7 @@ public class BatchTransactedConcurrentMu
private static final int MAX_ATTEMPTS_COUNT = 50;
svn commit: r1391061 - in /camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx: BatchTransactedConcurrentMultipleConsumerTest.java TransactedConcurrentConsumersTest.java
Author: sully6768
Date: Thu Sep 27 15:50:47 2012
New Revision: 1391061
URL: http://svn.apache.org/viewvc?rev=1391061&view=rev
Log:
Fixed log message to reflect actual behavior.
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java?rev=1391061&r1=1391060&r2=1391061&view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
Thu Sep 27 15:50:47 2012
@@ -94,7 +94,7 @@ public class BatchTransactedConcurrentMu
@Override
public void process(Exchange exchange) throws
Exception {
if (counter.incrementAndGet() ==
MAX_ATTEMPTS_COUNT) {
-log.info("Exchange does not have a retry
message. Set the exception and allow the retry.");
+log.info("{} Messages have been processed.
Failing the exchange to force a rollback of the transaction.",
MAX_ATTEMPTS_COUNT);
exchange.getOut().setFault(true);
}
}
Modified:
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java?rev=1391061&r1=1391060&r2=1391061&view=diff
==
---
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
(original)
+++
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
Thu Sep 27 15:50:47 2012
@@ -96,7 +96,7 @@ public class TransactedConcurrentConsume
public void process(Exchange exchange) throws
Exception {
int count = counter.incrementAndGet();
if (count == MAX_ATTEMPTS_COUNT) {
-log.info("Exchange does not have a retry
message. Set the exception and allow the retry.");
+log.info("{} Messages have been processed.
Failing the exchange to force a rollback of the transaction.",
MAX_ATTEMPTS_COUNT);
exchange.getOut().setFault(true);
counter.set(0);
}
[CONF] Apache Camel > Camel 2.11.0 Release
Camel 2.11.0 Release
Page edited by Claus Ibsen
Changes (2)
...
* ConcurrentLinkedHashMap 1.2 to 1.3.1 * Ehcache bundle 2.5.1 to 2.6.0
* Groovy 1.8.6 to 2.0.24
* GSon 2.1 to 2.2.2 * Hazelcast 2.0.2 to 2.3
...
* Krati 0.4.5 to 0.4.6 * Lucene 3.6.0 to 3.6.1
* Mina 2.0.4 to 2.0.5
* Netty 3.5.1 to 3.5.7 * Ognl bundle 3.0.4_1 to 3.0.5_1
...
Full Content
Camel 2.11.0 release (currently in progress)
New and Noteworthy
Welcome to the 2.11.0 release with approximately XXX issues resolved - including new features, improvements, and bug fixes, such as:
Added support for SOAP 1.2 in SOAP data format.
Cache operation for add/update now supports expiry headers to control time to live/idle/eternal.
Added allowNullBody option to JMS to configure whether sending messages with no body is allowed.
Added connectOnStartup option to HDFS to allow to connect on demand, to avoid having Hadoop block for long time connecting to the HDFS cluster, as it has a hardcoded 15 minute retry mechanism.
Added support for daily and weekly trends to Twitter component.
The Camel Maven Archetypes now generates projects without any license headers.
Added 'rejectOld' option to the Resequencer to prevent out of order messages from being delivered after capacity/timeout events occur
Further optimized XPath under concurrent load, and as well ensured resources are cleaned up eagerly
Added options allowNullBody and readLockMinLength to the File and FTP components.
Made changed read lock strategy on FTP go faster (eg when the FTP server has a lot of files in the directory) if you enable the fastExistsCheck=true option as well. Notice that some FTP server may not support this.
HL7 moves to HAPI 2.0 and supports using a dedicated Parser instance in the HL7 MLLP codec and DataFormat. Added "Terser" language and _expression_ to be able to extract fields from a parsed message. HL7 now uses Apache Mina 2.x.
Add an option HttpMethodRestrict to restrict HTTP method in Jetty and SERVLET
Add support for selection of Direct-VM consumers by using ant-like path _expression_.
The POJO Producing, and POJO Consuming with @Consume, @Produce, @EndpointInject now supports a new {{property} attribute to get the endpoint configuration from a bean property (eg using a getter method); this allows you to configure this on the bean using conventional bean configuration.
Testing with camel-test-blueprint on Windows no longer tries to cleanup after testing taking up 5 seconds and logging WARNs.
The File, and FTP components now support fileExist=Move option to move any existing files before writing a file.
Added option loadStatisticsEnabled on Camel JMX to allow to disable load statistics if not needed (avoids a background thread being in use, to calculate the load stats).
Enabled "lazy connections" for XMPP providers via the testConnectionOnStartup option
Added a connection monitor to detect and fix dropped XMPP consumer connections at configurable connectionPollDelay intervals
Added an org.apache.camel.builder.ExchangeBuilder to build the Exchange using a builder pattern.
The Camel Run Maven Goal can now run CDI applications.
The Camel CDI component has improved a lot.
Added option allowRedeliveryWhileStopping to error handlers to control if redelivery is allowed during stopping/shutting down Camel or the route(s). Turning this option false allows to stop quicker by rejecting redelivery attempts.
Added support for specifying user info in Camel Endpoint urls, which contains the @ sign; now the @ sign can be given as is; without being encoded to %40.
Added robust connection support for JMX. Optional testConnectionOnStartup allows a JMX consumer to attach to a JMX server that becomes available after the JMX endpoint starts; reconnectOnConnectionFailure enables re-connection of failed JMX connections.
JAXB and SOAP data format now supports controlling namespace prefix mappings when marshalling (eg to avoid prefixes such as ns2, ns3, ns4 etc.)
Added support for using raw uris when Components create Endpoints. This gives component writers full power in case their component has special syntax/notation for endpoint uri configurations.
EIPs configured with custom AggregationStrategy will now strict check the custom strategy exists in the Registry and no longer fallback and use a default strategy if not.
Fixed issues
Fixed RoutePolicy used from Spring XML with routePolicyRef may not invoke all callbacks on the policy.
Fixed MINA consumer to force disconnect upon timeout when doing request/reply, as late replies may cause side effects otherwise.
Fixed Simple language with empty quoted literals in predicates, so you can compare
svn commit: r1391059 - /camel/trunk/parent/pom.xml
Author: davsclaus Date: Thu Sep 27 15:37:00 2012 New Revision: 1391059 URL: http://svn.apache.org/viewvc?rev=1391059&view=rev Log: Upgraded mina2 and groovy JARs Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1391059&r1=1391058&r2=1391059&view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Thu Sep 27 15:37:00 2012 @@ -129,7 +129,7 @@ 1.41.5.w1 11_1 13.0.1 -2.0.2 +2.0.4 2.2.2 2.0_2 2.0 @@ -205,7 +205,7 @@ 2.5.1 1.1.7_6 1.1.7 -2.0.4 +2.0.5 1.9.0 2.7.3 1.2
svn commit: r1391058 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/impl/ main/java/org/apache/camel/management/ main/java/org/apache/camel/spi/ test/java/org/apache/camel/impl/
Author: davsclaus
Date: Thu Sep 27 15:31:44 2012
New Revision: 1391058
URL: http://svn.apache.org/viewvc?rev=1391058&view=rev
Log:
CAMEL-5658: Added newThread method to executor serivce manager so we can get a
thread without a thread pool if needed.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1391058&r1=1391057&r2=1391058&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Thu Sep 27 15:31:44 2012
@@ -146,6 +146,12 @@ public class DefaultExecutorServiceManag
}
@Override
+public Thread newThread(String name, Runnable runnable) {
+ThreadFactory factory = createThreadFactory(name, true);
+return factory.newThread(runnable);
+}
+
+@Override
public ExecutorService newDefaultThreadPool(Object source, String name) {
return newThreadPool(source, name, getDefaultThreadPoolProfile());
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1391058&r1=1391057&r2=1391058&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Thu Sep 27 15:31:44 2012
@@ -405,7 +405,8 @@ public class DefaultManagementAgent exte
// use async thread for starting the JMX Connector
// (no need to use a thread pool or enlist in JMX as this thread is
terminated when the JMX connector has been started)
-Thread thread = new Thread(new Runnable() {
+String threadName =
camelContext.getExecutorServiceManager().resolveThreadName("JMXConnector: " +
url);
+Thread thread =
getCamelContext().getExecutorServiceManager().newThread(threadName, new
Runnable() {
public void run() {
try {
LOG.debug("Staring JMX Connector thread to listen at: {}",
url);
@@ -416,9 +417,6 @@ public class DefaultManagementAgent exte
}
}
});
-thread.setDaemon(true);
-String threadName =
camelContext.getExecutorServiceManager().resolveThreadName("JMXConnector: " +
url);
-thread.setName(threadName);
thread.start();
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java?rev=1391058&r1=1391057&r2=1391058&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
Thu Sep 27 15:31:44 2012
@@ -19,6 +19,7 @@ package org.apache.camel.spi;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
import org.apache.camel.ShutdownableService;
@@ -146,6 +147,15 @@ public interface ExecutorServiceManager
long getShutdownAwaitTermination();
/**
+ * Creates a new daemon thread with the given name.
+ *
+ * @param name name which is appended to the thread name
+ * @param runnable a runnable to be executed by new thread instance
+ * @return the created thread
+ */
+Thread newThread(String name, Runnable runnable);
+
+/**
* Creates a new thread pool using the default thread pool profile.
*
* @param source the source object, usually it should be this
passed in as parameter
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java?rev=1391058&r1=1391057&r2=1391058&view=d
svn commit: r1391049 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Author: davsclaus
Date: Thu Sep 27 15:02:11 2012
New Revision: 1391049
URL: http://svn.apache.org/viewvc?rev=1391049&view=rev
Log:
CAMEL-5657: Ensure eip shutdown thread pool when itself shutdown.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1391044
Merged /camel/branches/camel-2.10.x:r1391045
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1391049&r1=1391048&r2=1391049&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Sep 27 15:02:11 2012
@@ -955,6 +955,9 @@ public class MulticastProcessor extends
ServiceHelper.stopAndShutdownServices(processors, errorHandlers);
// only clear error handlers when shutting down
errorHandlers.clear();
+if (aggregateExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService);
+}
}
protected static void setToEndpoint(Exchange exchange, Processor
processor) {
svn commit: r1391045 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Author: davsclaus
Date: Thu Sep 27 15:00:32 2012
New Revision: 1391045
URL: http://svn.apache.org/viewvc?rev=1391045&view=rev
Log:
CAMEL-5657: Ensure eip shutdown thread pool when itself shutdown.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1391044
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1391045&r1=1391044&r2=1391045&view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Sep 27 15:00:32 2012
@@ -967,6 +967,9 @@ public class MulticastProcessor extends
if (shutdownExecutorService && executorService != null) {
getCamelContext().getExecutorServiceManager().shutdownNow(executorService);
}
+if (aggregateExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService);
+}
}
protected static void setToEndpoint(Exchange exchange, Processor
processor) {
svn commit: r1391044 - /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Author: davsclaus
Date: Thu Sep 27 14:59:17 2012
New Revision: 1391044
URL: http://svn.apache.org/viewvc?rev=1391044&view=rev
Log:
CAMEL-5657: Ensure eip shutdown thread pool when itself shutdown.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1391044&r1=1391043&r2=1391044&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Sep 27 14:59:17 2012
@@ -967,6 +967,9 @@ public class MulticastProcessor extends
if (shutdownExecutorService && executorService != null) {
getCamelContext().getExecutorServiceManager().shutdownNow(executorService);
}
+if (aggregateExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService);
+}
}
protected static void setToEndpoint(Exchange exchange, Processor
processor) {
svn commit: r1391026 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Author: davsclaus
Date: Thu Sep 27 14:20:08 2012
New Revision: 1391026
URL: http://svn.apache.org/viewvc?rev=1391026&view=rev
Log:
CAMEL-5657: Ensure recipient list eip shutdown thread pool on shutdown if
instructed to do so.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1391021
Merged /camel/branches/camel-2.10.x:r1391024
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391026&r1=1391025&r2=1391026&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Thu Sep 27 14:20:08 2012
@@ -175,6 +175,10 @@ public class RecipientList extends Servi
// remove producer cache from service
camelContext.removeService(producerCache);
ServiceHelper.stopAndShutdownService(producerCache);
+
+if (shutdownExecutorService && executorService != null) {
+
camelContext.getExecutorServiceManager().shutdownNow(executorService);
+}
}
public boolean isStreaming() {
svn commit: r1391024 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Author: davsclaus
Date: Thu Sep 27 14:18:51 2012
New Revision: 1391024
URL: http://svn.apache.org/viewvc?rev=1391024&view=rev
Log:
CAMEL-5657: Ensure recipient list eip shutdown thread pool on shutdown if
instructed to do so.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1391021
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391024&r1=1391023&r2=1391024&view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Thu Sep 27 14:18:51 2012
@@ -172,6 +172,10 @@ public class RecipientList extends Servi
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownService(producerCache);
+
+if (shutdownExecutorService && executorService != null) {
+
camelContext.getExecutorServiceManager().shutdownNow(executorService);
+}
}
public boolean isStreaming() {
svn commit: r1391021 - /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Author: davsclaus
Date: Thu Sep 27 14:15:46 2012
New Revision: 1391021
URL: http://svn.apache.org/viewvc?rev=1391021&view=rev
Log:
CAMEL-5657: Ensure recipient list eip shutdown thread pool on shutdown if
instructed to do so.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391021&r1=1391020&r2=1391021&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Thu Sep 27 14:15:46 2012
@@ -172,6 +172,10 @@ public class RecipientList extends Servi
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownService(producerCache);
+
+if (shutdownExecutorService && executorService != null) {
+
camelContext.getExecutorServiceManager().shutdownNow(executorService);
+}
}
public boolean isStreaming() {
svn commit: r1391010 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Author: davsclaus
Date: Thu Sep 27 13:46:11 2012
New Revision: 1391010
URL: http://svn.apache.org/viewvc?rev=1391010&view=rev
Log:
CAMEL-5656: JMXConnector started async no need for thread pool as thread should
terminate after started.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1391008
Merged /camel/branches/camel-2.10.x:r1391009
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1391010&r1=1391009&r2=1391010&view=diff
==
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Thu Sep 27 13:46:11 2012
@@ -25,7 +25,6 @@ import java.rmi.registry.LocateRegistry;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ExecutorService;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -58,7 +57,6 @@ public class DefaultManagementAgent exte
private static final transient Logger LOG =
LoggerFactory.getLogger(DefaultManagementAgent.class);
private CamelContext camelContext;
-private ExecutorService executorService;
private MBeanServer server;
// need a name -> actual name mapping as some servers changes the names
(suc as WebSphere)
private final Map mbeansRegistered = new
HashMap();
@@ -207,14 +205,6 @@ public class DefaultManagementAgent exte
this.registerNewRoutes = registerNewRoutes;
}
-public ExecutorService getExecutorService() {
-return executorService;
-}
-
-public void setExecutorService(ExecutorService executorService) {
-this.executorService = executorService;
-}
-
public CamelContext getCamelContext() {
return camelContext;
}
@@ -271,6 +261,7 @@ public class DefaultManagementAgent exte
if (cs != null) {
try {
cs.stop();
+LOG.debug("Stopped JMX Connector");
} catch (IOException e) {
LOG.debug("Error occurred during stopping JMXConnectorService:
"
+ cs + ". This exception will be ignored.");
@@ -413,23 +404,23 @@ public class DefaultManagementAgent exte
cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null,
server);
-if (executorService == null) {
-// we only need a single thread for the JMX connector
-executorService =
camelContext.getExecutorServiceManager().newSingleThreadExecutor(this,
"JMXConnector: " + url);
-}
-
-// execute the JMX connector
-executorService.execute(new Runnable() {
+// use async thread for starting the JMX Connector
+// (no need to use a thread pool or enlist in JMX as this thread is
terminated when the JMX connector has been started)
+Thread thread = new Thread(new Runnable() {
public void run() {
try {
+LOG.debug("Staring JMX Connector thread to listen at: {}",
url);
cs.start();
+LOG.info("JMX Connector thread started and listening at:
{}", url);
} catch (IOException ioe) {
-LOG.warn("Could not start JMXConnector thread.", ioe);
+LOG.warn("Could not start JMXConnector thread at: " + url
+ ". JMX Connector not in use.", ioe);
}
}
});
-
-LOG.info("JMX Connector thread started and listening at: " + url);
+thread.setDaemon(true);
+String threadName =
camelContext.getExecutorServiceManager().resolveThreadName("JMXConnector: " +
url);
+thread.setName(threadName);
+thread.start();
}
}
svn commit: r1391009 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Author: davsclaus
Date: Thu Sep 27 13:44:49 2012
New Revision: 1391009
URL: http://svn.apache.org/viewvc?rev=1391009&view=rev
Log:
CAMEL-5656: JMXConnector started async no need for thread pool as thread should
terminate after started.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1391008
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1391009&r1=1391008&r2=1391009&view=diff
==
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Thu Sep 27 13:44:49 2012
@@ -25,7 +25,6 @@ import java.rmi.registry.LocateRegistry;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ExecutorService;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -58,7 +57,6 @@ public class DefaultManagementAgent exte
private static final transient Logger LOG =
LoggerFactory.getLogger(DefaultManagementAgent.class);
private CamelContext camelContext;
-private ExecutorService executorService;
private MBeanServer server;
// need a name -> actual name mapping as some servers changes the names
(suc as WebSphere)
private final Map mbeansRegistered = new
HashMap();
@@ -207,14 +205,6 @@ public class DefaultManagementAgent exte
this.registerNewRoutes = registerNewRoutes;
}
-public ExecutorService getExecutorService() {
-return executorService;
-}
-
-public void setExecutorService(ExecutorService executorService) {
-this.executorService = executorService;
-}
-
public CamelContext getCamelContext() {
return camelContext;
}
@@ -271,6 +261,7 @@ public class DefaultManagementAgent exte
if (cs != null) {
try {
cs.stop();
+LOG.debug("Stopped JMX Connector");
} catch (IOException e) {
LOG.debug("Error occurred during stopping JMXConnectorService:
"
+ cs + ". This exception will be ignored.");
@@ -412,23 +403,23 @@ public class DefaultManagementAgent exte
cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null,
server);
-if (executorService == null) {
-// we only need a single thread for the JMX connector
-executorService =
camelContext.getExecutorServiceManager().newSingleThreadExecutor(this,
"JMXConnector: " + url);
-}
-
-// execute the JMX connector
-executorService.execute(new Runnable() {
+// use async thread for starting the JMX Connector
+// (no need to use a thread pool or enlist in JMX as this thread is
terminated when the JMX connector has been started)
+Thread thread = new Thread(new Runnable() {
public void run() {
try {
+LOG.debug("Staring JMX Connector thread to listen at: {}",
url);
cs.start();
+LOG.info("JMX Connector thread started and listening at:
{}", url);
} catch (IOException ioe) {
-LOG.warn("Could not start JMXConnector thread.", ioe);
+LOG.warn("Could not start JMXConnector thread at: " + url
+ ". JMX Connector not in use.", ioe);
}
}
});
-
-LOG.info("JMX Connector thread started and listening at: " + url);
+thread.setDaemon(true);
+String threadName =
camelContext.getExecutorServiceManager().resolveThreadName("JMXConnector: " +
url);
+thread.setName(threadName);
+thread.start();
}
}
svn commit: r1391008 - /camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Author: davsclaus
Date: Thu Sep 27 13:43:22 2012
New Revision: 1391008
URL: http://svn.apache.org/viewvc?rev=1391008&view=rev
Log:
CAMEL-5656: JMXConnector started async no need for thread pool as thread should
terminate after started.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1391008&r1=1391007&r2=1391008&view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
Thu Sep 27 13:43:22 2012
@@ -25,7 +25,6 @@ import java.rmi.registry.LocateRegistry;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ExecutorService;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -58,7 +57,6 @@ public class DefaultManagementAgent exte
private static final transient Logger LOG =
LoggerFactory.getLogger(DefaultManagementAgent.class);
private CamelContext camelContext;
-private ExecutorService executorService;
private MBeanServer server;
// need a name -> actual name mapping as some servers changes the names
(suc as WebSphere)
private final Map mbeansRegistered = new
HashMap();
@@ -207,14 +205,6 @@ public class DefaultManagementAgent exte
this.registerNewRoutes = registerNewRoutes;
}
-public ExecutorService getExecutorService() {
-return executorService;
-}
-
-public void setExecutorService(ExecutorService executorService) {
-this.executorService = executorService;
-}
-
public CamelContext getCamelContext() {
return camelContext;
}
@@ -271,6 +261,7 @@ public class DefaultManagementAgent exte
if (cs != null) {
try {
cs.stop();
+LOG.debug("Stopped JMX Connector");
} catch (IOException e) {
LOG.debug("Error occurred during stopping JMXConnectorService:
"
+ cs + ". This exception will be ignored.");
@@ -412,23 +403,23 @@ public class DefaultManagementAgent exte
cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null,
server);
-if (executorService == null) {
-// we only need a single thread for the JMX connector
-executorService =
camelContext.getExecutorServiceManager().newSingleThreadExecutor(this,
"JMXConnector: " + url);
-}
-
-// execute the JMX connector
-executorService.execute(new Runnable() {
+// use async thread for starting the JMX Connector
+// (no need to use a thread pool or enlist in JMX as this thread is
terminated when the JMX connector has been started)
+Thread thread = new Thread(new Runnable() {
public void run() {
try {
+LOG.debug("Staring JMX Connector thread to listen at: {}",
url);
cs.start();
+LOG.info("JMX Connector thread started and listening at:
{}", url);
} catch (IOException ioe) {
-LOG.warn("Could not start JMXConnector thread.", ioe);
+LOG.warn("Could not start JMXConnector thread at: " + url
+ ". JMX Connector not in use.", ioe);
}
}
});
-
-LOG.info("JMX Connector thread started and listening at: " + url);
+thread.setDaemon(true);
+String threadName =
camelContext.getExecutorServiceManager().resolveThreadName("JMXConnector: " +
url);
+thread.setName(threadName);
+thread.start();
}
}
svn commit: r1390985 - in /camel/trunk/examples/camel-example-cdi: README.txt pom.xml src/main/webapp/
Author: bvahdat
Date: Thu Sep 27 13:06:17 2012
New Revision: 1390985
URL: http://svn.apache.org/viewvc?rev=1390985&view=rev
Log:
Fixed the two maven profiles (glassfish/jboss) being broken again. Also removed
'src/main/webapp/beans.xml' which is obsolete.
Removed:
camel/trunk/examples/camel-example-cdi/src/main/webapp/
Modified:
camel/trunk/examples/camel-example-cdi/README.txt
camel/trunk/examples/camel-example-cdi/pom.xml
Modified: camel/trunk/examples/camel-example-cdi/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/README.txt?rev=1390985&r1=1390984&r2=1390985&view=diff
==
--- camel/trunk/examples/camel-example-cdi/README.txt (original)
+++ camel/trunk/examples/camel-example-cdi/README.txt Thu Sep 27 13:06:17 2012
@@ -21,7 +21,7 @@ You can see the routing rules by looking
When we launch the example using the camel maven plugin, a local CDI container
is created and started. Additionally there're two maven profiles being defined
by this example (see pom.xml for details) so that using maven we can easily
embed
-and deploy the example into an application server.
+and deploy the example as a web-app into an application server.
To run the example using JBoss type
mvn deploy -Pjboss
Modified: camel/trunk/examples/camel-example-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/pom.xml?rev=1390985&r1=1390984&r2=1390985&view=diff
==
--- camel/trunk/examples/camel-example-cdi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cdi/pom.xml Thu Sep 27 13:06:17 2012
@@ -54,7 +54,8 @@
camel-cdi
-
+
+
org.apache.geronimo.specs
geronimo-ejb_3.1_spec
@@ -94,7 +95,7 @@
-
+
org.apache.camel
camel-maven-plugin
@@ -170,11 +171,11 @@
-org.jboss.spec
-jboss-javaee-6.0
-${jboss-javaee-6-version}
-pom
-provided
+ org.jboss.spec
+ jboss-javaee-6.0
+ ${jboss-javaee-6-version}
+ pom
+ provided
org.jboss.arquillian.container
@@ -195,6 +196,10 @@
glassfish
3.1.2.2
+
+
+
+true
@@ -225,6 +230,10 @@
jboss
7.2.Final
+
+
+
+true
svn commit: r1390950 - in /camel/branches/camel-2.9.x: ./ components/camel-core-xml/src/main/java/org/apache/camel/core/xml/ components/camel-spring/src/test/java/org/apache/camel/spring/config/ compo
Author: davsclaus
Date: Thu Sep 27 11:39:39 2012
New Revision: 1390950
URL: http://svn.apache.org/viewvc?rev=1390950&view=rev
Log:
CAMEL-5655: Fixed endpoint factorty bean when using multiple camel contexts.
Added:
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
- copied unchanged from r1390947,
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
- copied unchanged from r1390947,
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1390946
Merged /camel/branches/camel-2.10.x:r1390947
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1390950&r1=1390949&r2=1390950&view=diff
==
---
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Thu Sep 27 11:39:39 2012
@@ -64,6 +64,10 @@ public abstract class AbstractCamelFacto
}
public CamelContext getCamelContext() {
+if (ObjectHelper.isNotEmpty(camelContextId)) {
+// always return the context by its id
+return getCamelContextWithId(camelContextId);
+}
return camelContext;
}
svn commit: r1390947 - in /camel/branches/camel-2.10.x: ./ components/camel-core-xml/src/main/java/org/apache/camel/core/xml/ components/camel-spring/src/test/java/org/apache/camel/spring/config/ comp
Author: davsclaus
Date: Thu Sep 27 11:37:42 2012
New Revision: 1390947
URL: http://svn.apache.org/viewvc?rev=1390947&view=rev
Log:
CAMEL-5655: Fixed endpoint factorty bean when using multiple camel contexts.
Added:
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
- copied unchanged from r1390946,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
- copied unchanged from r1390946,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1390946
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1390947&r1=1390946&r2=1390947&view=diff
==
---
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Thu Sep 27 11:37:42 2012
@@ -63,6 +63,10 @@ public abstract class AbstractCamelFacto
}
public CamelContext getCamelContext() {
+if (ObjectHelper.isNotEmpty(camelContextId)) {
+// always return the context by its id
+return getCamelContextWithId(camelContextId);
+}
return camelContext;
}
svn commit: r1390946 - in /camel/trunk/components: camel-core-xml/src/main/java/org/apache/camel/core/xml/ camel-spring/src/test/java/org/apache/camel/spring/config/ camel-spring/src/test/resources/or
Author: davsclaus
Date: Thu Sep 27 11:36:07 2012
New Revision: 1390946
URL: http://svn.apache.org/viewvc?rev=1390946&view=rev
Log:
CAMEL-5655: Fixed endpoint factorty bean when using multiple camel contexts.
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
- copied, changed from r1390936,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
- copied, changed from r1390936,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/dualCamelContextManagedTest.xml
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1390946&r1=1390945&r2=1390946&view=diff
==
---
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Thu Sep 27 11:36:07 2012
@@ -63,6 +63,10 @@ public abstract class AbstractCamelFacto
}
public CamelContext getCamelContext() {
+if (ObjectHelper.isNotEmpty(camelContextId)) {
+// always return the context by its id
+return getCamelContextWithId(camelContextId);
+}
return camelContext;
}
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
(from r1390936,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java&r1=1390936&r2=1390946&rev=1390946&view=diff
==
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
Thu Sep 27 11:36:07 2012
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.management;
-
-import java.util.Set;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
+package org.apache.camel.spring.config;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -27,58 +25,30 @@ import org.springframework.context.suppo
/**
* @version
*/
-public class DualCamelContextManagedTest extends SpringTestSupport {
-
-@Override
-protected boolean useJmx() {
-return true;
-}
+public class DualCamelContextEndpointOutsideTest extends SpringTestSupport {
protected AbstractXmlApplicationContext createApplicationContext() {
-return new
ClassPathXmlApplicationContext("org/apache/camel/spring/management/dualCamelContextManagedTest.xml");
+return new
ClassPathXmlApplicationContext("org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml");
}
-public void testDualCamelContextManaged() throws Exception {
-
-MBeanServer mbeanServer =
context.getManagementStrategy().getManagementAgent().getMBeanServer();
-
-ObjectName on1 = null;
-ObjectName on2 = null;
-Set set = mbeanServer.queryNames(new
ObjectName("*:type=routes,*"), null);
-// filter out only camel-A and camel-B
-for (ObjectName on : set) {
-if (on.getCanonicalName().contains("camel-A")) {
-on1 = on;
-} else if (on.getCanonicalName().contains("camel-B")) {
-on2 = on;
-}
-}
-assertNotNull("Should have found camel-A route", on1);
-assertNotNull("Should have found camel-B route", on
svn commit: r1390930 - in /camel/branches/camel-2.10.x/components/camel-hbase/src: main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java test/java/org/apache/camel/component/hb
Author: iocanel
Date: Thu Sep 27 10:22:02 2012
New Revision: 1390930
URL: http://svn.apache.org/viewvc?rev=1390930&view=rev
Log:
[CAMEL-5653] camel-hbase header mapping strategy will skip null
family/qualifier pairs.
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1390930&r1=1390929&r2=1390930&view=diff
==
---
camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
Thu Sep 27 10:22:02 2012
@@ -64,12 +64,14 @@ public class HeaderMappingStrategy imple
hRow.setId(id);
hRow.setRowType(rowClass);
-hCell.setQualifier(columnName);
-hCell.setFamily(columnFamily);
-hCell.setValue(value);
-// String is the default value type
-hCell.setValueType((valueClass != null) ? valueClass :
String.class);
-hRow.getCells().add(hCell);
+if (columnFamily != null && columnName != null) {
+hCell.setQualifier(columnName);
+hCell.setFamily(columnFamily);
+hCell.setValue(value);
+// String is the default value type
+hCell.setValueType((valueClass != null) ? valueClass :
String.class);
+hRow.getCells().add(hCell);
+}
}
return hRow;
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1390930&r1=1390929&r2=1390930&view=diff
==
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Thu Sep 27 10:22:02 2012
@@ -121,8 +121,6 @@ public class HBaseProducerTest extends C
Exchange getExchange =
startWithModelEndpoint.createExchange(ExchangePattern.InOut);
getExchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
-
getExchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
-
getExchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
getExchange.getIn().setHeader(HBaseConstants.OPERATION,
HBaseConstants.GET);
Exchange resp = template.send(startWithModelEndpoint, getExchange);
svn commit: r1390929 - in /camel/branches/camel-2.10.x/components/camel-hbase/src/test: java/org/apache/camel/component/hbase/ java/org/apache/camel/component/hbase/processor/idempotent/ resources/
Author: iocanel
Date: Thu Sep 27 10:21:23 2012
New Revision: 1390929
URL: http://svn.apache.org/viewvc?rev=1390929&view=rev
Log:
[CAMEL-5652] Refactored camel-hbase unit tests to use person as the target
domain.
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringConsumerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseSpringProducerTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/consumer.xml
camel/branches/camel-2.10.x/components/camel-hbase/src/test/resources/producer.xml
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java?rev=1390929&r1=1390928&r2=1390929&view=diff
==
---
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
Thu Sep 27 10:21:23 2012
@@ -40,7 +40,7 @@ public class CamelHBaseFilterTest extend
public void setUp() throws Exception {
if (systemReady) {
try {
-
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(DEFAULTTABLE), families);
+
hbaseUtil.createTable(HBaseHelper.getHBaseFieldAsBytes(PERSON_TABLE), families);
} catch (TableExistsException ex) {
//Ignore if table exists
}
@@ -52,7 +52,7 @@ public class CamelHBaseFilterTest extend
@After
public void tearDown() throws Exception {
if (systemReady) {
-hbaseUtil.deleteTable(DEFAULTTABLE.getBytes());
+hbaseUtil.deleteTable(PERSON_TABLE.getBytes());
super.tearDown();
}
}
@@ -74,11 +74,11 @@ public class CamelHBaseFilterTest extend
Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
exchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
-
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0]);
-exchange.getIn().setHeader(HbaseAttribute.HBASE_VALUE.asHeader(),
body[0]);
+
exchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
+exchange.getIn().setHeader(HbaseAttribute.HBASE_VALUE.asHeader(),
body[0][0][0]);
Exchange resp = template.send(endpoint, exchange);
Message out = resp.getOut();
-assertTrue(out.getHeaders().containsValue(body[0]) &&
!out.getHeaders().containsValue(body[1]) &&
!out.getHeaders().containsValue(body[2]));
+assertTrue(out.getHeaders().containsValue(body[0][0][0]) &&
!out.getHeaders().containsValue(body[1][0][0]) &&
!out.getHeaders().containsValue(body[2][0][0]));
}
}
@@ -93,9 +93,9 @@ public class CamelHBaseFilterTest extend
@Override
public void configure() {
from("direct:start")
-.to("hbase://" + DEFAULTTABLE);
+.to("hbase://" + PERSON_TABLE);
from("direct:scan")
-.to("hbase://" + DEFAULTTABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&filters=#myFilters");
+.to("hbase://" + PERSON_TABLE + "?operation=" +
HBaseConstants.SCAN + "&maxResults=2&filters=#myFilters");
}
};
}
Modified:
camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java?rev=1390929&r1=1390928&r2=1390929&view=diff
===
svn commit: r1390923 - /camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
Author: jstrachan
Date: Thu Sep 27 10:12:12 2012
New Revision: 1390923
URL: http://svn.apache.org/viewvc?rev=1390923&view=rev
Log:
avoid using a weld class directly (used by accident, bad James! :)
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java?rev=1390923&r1=1390922&r2=1390923&view=diff
==
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
Thu Sep 27 10:12:12 2012
@@ -16,8 +16,10 @@
*/
package org.apache.camel.cdi.internal;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
@@ -28,7 +30,6 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
-import org.jboss.weld.bean.ProducerMethod;
/**
* Configuration options to be applied to a {@link
org.apache.camel.CamelContext} by a {@link CamelContextBean}
@@ -44,9 +45,13 @@ public class CamelContextConfig {
for (Bean bean : routeBuilderBeans) {
CreationalContext createContext =
beanManager.createCreationalContext(bean);
Class beanClass = bean.getBeanClass();
-if (bean instanceof ProducerMethod) {
-ProducerMethod producerMethod = (ProducerMethod) bean;
-beanClass = producerMethod.getType();
+Set types = bean.getTypes();
+for (Type type : types) {
+// lets use the first type for producer methods
+if (type instanceof Class) {
+beanClass = (Class) type;
+break;
+}
}
Object reference = beanManager.getReference(bean, beanClass,
createContext);
ObjectHelper.notNull(reference, "Could not instantiate bean of
type " + beanClass.getName() + " for " + bean);
svn commit: r1390922 - in /camel/trunk/components/camel-hbase/src: main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java test/java/org/apache/camel/component/hbase/HBaseProduce
Author: iocanel
Date: Thu Sep 27 10:11:51 2012
New Revision: 1390922
URL: http://svn.apache.org/viewvc?rev=1390922&view=rev
Log:
[CAMEL-5653] camel-hbase header mapping strategy will skip null
family/qualifier pairs.
Modified:
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Modified:
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1390922&r1=1390921&r2=1390922&view=diff
==
---
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
(original)
+++
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
Thu Sep 27 10:11:51 2012
@@ -64,12 +64,14 @@ public class HeaderMappingStrategy imple
hRow.setId(id);
hRow.setRowType(rowClass);
-hCell.setQualifier(columnName);
-hCell.setFamily(columnFamily);
-hCell.setValue(value);
-// String is the default value type
-hCell.setValueType((valueClass != null) ? valueClass :
String.class);
-hRow.getCells().add(hCell);
+if (columnFamily != null && columnName != null) {
+hCell.setQualifier(columnName);
+hCell.setFamily(columnFamily);
+hCell.setValue(value);
+// String is the default value type
+hCell.setValueType((valueClass != null) ? valueClass :
String.class);
+hRow.getCells().add(hCell);
+}
}
return hRow;
}
Modified:
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1390922&r1=1390921&r2=1390922&view=diff
==
---
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
(original)
+++
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
Thu Sep 27 10:11:51 2012
@@ -121,8 +121,6 @@ public class HBaseProducerTest extends C
Exchange getExchange =
startWithModelEndpoint.createExchange(ExchangePattern.InOut);
getExchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
-
getExchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(),
family[0]);
-
getExchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(),
column[0][0]);
getExchange.getIn().setHeader(HBaseConstants.OPERATION,
HBaseConstants.GET);
Exchange resp = template.send(startWithModelEndpoint, getExchange);
svn commit: r1390918 - in /camel/trunk: components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/ examples/camel-example-cdi/ examples/camel-example-cdi/src/test/java/org/apache/camel/example/
Author: jstrachan
Date: Thu Sep 27 10:04:36 2012
New Revision: 1390918
URL: http://svn.apache.org/viewvc?rev=1390918&view=rev
Log:
split the example integration test into 2 separate tests; one using an embedded
@Produces @ContextAware RouteBuilder producer method and another using a
separate TestRouteBuilder; also fixed the bug in CamelContextConfig of not
correctly using the correct class for producer methods or beans
Added:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
(contents, props changed)
- copied, changed from r1390881,
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
(contents, props changed)
- copied, changed from r1390867,
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java
(with props)
Removed:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
camel/trunk/examples/camel-example-cdi/pom.xml
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java?rev=1390918&r1=1390917&r2=1390918&view=diff
==
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextConfig.java
Thu Sep 27 10:04:36 2012
@@ -28,6 +28,7 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
+import org.jboss.weld.bean.ProducerMethod;
/**
* Configuration options to be applied to a {@link
org.apache.camel.CamelContext} by a {@link CamelContextBean}
@@ -43,6 +44,10 @@ public class CamelContextConfig {
for (Bean bean : routeBuilderBeans) {
CreationalContext createContext =
beanManager.createCreationalContext(bean);
Class beanClass = bean.getBeanClass();
+if (bean instanceof ProducerMethod) {
+ProducerMethod producerMethod = (ProducerMethod) bean;
+beanClass = producerMethod.getType();
+}
Object reference = beanManager.getReference(bean, beanClass,
createContext);
ObjectHelper.notNull(reference, "Could not instantiate bean of
type " + beanClass.getName() + " for " + bean);
try {
Modified: camel/trunk/examples/camel-example-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/pom.xml?rev=1390918&r1=1390917&r2=1390918&view=diff
==
--- camel/trunk/examples/camel-example-cdi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cdi/pom.xml Thu Sep 27 10:04:36 2012
@@ -145,6 +145,20 @@
false
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+**/*Test.java
+
+
+**/*XXXTest.*
+
+
+
@@ -156,6 +170,13 @@
+org.jboss.spec
+jboss-javaee-6.0
+${jboss-javaee-6-version}
+pom
+provided
+
+
org.jboss.arquillian.container
arquillian-weld-ee-embedded-1.1
${arquillian-weld-ee-embedded-version}
Copied:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
(from r1390881,
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java?p2=camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java&p1=camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/IntegrationTest.java&r1=1390881&r2=1390918&rev=1390918&view=diff
==
svn commit: r1390891 - in /camel/branches/camel-2.9.x: ./ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Author: ningjiang
Date: Thu Sep 27 08:47:18 2012
New Revision: 1390891
URL: http://svn.apache.org/viewvc?rev=1390891&view=rev
Log:
Merged revisions 1390890 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
r1390890 | ningjiang | 2012-09-27 16:37:52 +0800 (Thu, 27 Sep 2012) | 2 lines
Remove the system out of WSRMTest
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Propchange: camel/branches/camel-2.9.x/
--
Merged /camel/trunk:r1390820
Merged /camel/branches/camel-2.10.x:r1390890
Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java?rev=1390891&r1=1390890&r2=1390891&view=diff
==
---
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Thu Sep 27 08:47:18 2012
@@ -59,7 +59,6 @@ public class WSRMTest extends AbstractJU
if (getCxfClientConfig() != null) {
cxfConfig = ClassLoaderUtils.getResource(getCxfClientConfig(),
this.getClass());
-System.out.println("cxfConfig" + cxfConfig);
}
proxyFactory.setBus(bf.createBus(cxfConfig));
proxyFactory.getOutInterceptors().add(new MessageLossSimulator());
svn commit: r1390890 - in /camel/branches/camel-2.10.x: ./ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Author: ningjiang
Date: Thu Sep 27 08:37:52 2012
New Revision: 1390890
URL: http://svn.apache.org/viewvc?rev=1390890&view=rev
Log:
Remove the system out of WSRMTest
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1390820
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java?rev=1390890&r1=1390889&r2=1390890&view=diff
==
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsrm/WSRMTest.java
Thu Sep 27 08:37:52 2012
@@ -59,7 +59,6 @@ public class WSRMTest extends AbstractJU
if (getCxfClientConfig() != null) {
cxfConfig = ClassLoaderUtils.getResource(getCxfClientConfig(),
this.getClass());
-System.out.println("cxfConfig" + cxfConfig);
}
proxyFactory.setBus(bf.createBus(cxfConfig));
proxyFactory.getOutInterceptors().add(new MessageLossSimulator());
