You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/12/15 08:58:49 UTC
svn commit: r726640 - in /activemq/camel/trunk/components/camel-mina/src:
main/java/org/apache/camel/component/mina/
test/java/org/apache/camel/component/mina/ test/resources/
Author: davsclaus
Date: Sun Dec 14 23:58:48 2008
New Revision: 726640
URL: http://svn.apache.org/viewvc?rev=726640&view=rev
Log:
CAMEL-1187: camel-mina: Added options for the vm protocol as well
Added:
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java (contents, props changed)
- copied, changed from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java (contents, props changed)
- copied, changed from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java (contents, props changed)
- copied, changed from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java (contents, props changed)
- copied, changed from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=726640&r1=726639&r2=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java Sun Dec 14 23:58:48 2008
@@ -113,7 +113,31 @@
IoAcceptor acceptor = new VmPipeAcceptor();
SocketAddress address = new VmPipeAddress(connectUri.getPort());
IoConnector connector = new VmPipeConnector();
- return new MinaEndpoint(uri, this, address, acceptor, null, connector, null, false, 0, false, false);
+
+ // connector config
+ configureCodecFactory("MinaProducer", connector.getDefaultConfig(), textline, encoding, codec);
+ if (minaLogger) {
+ connector.getFilterChain().addLast("logger", new LoggingFilter());
+ }
+
+ // acceptor connectorConfig
+ configureCodecFactory("MinaConsumer", acceptor.getDefaultConfig(), textline, encoding, codec);
+ if (minaLogger) {
+ acceptor.getFilterChain().addLast("logger", new LoggingFilter());
+ }
+
+ MinaEndpoint endpoint = new MinaEndpoint(uri, this, address, acceptor, null, connector, null, false, timeout, transferExchange, sync);
+ if (encoding != null) {
+ endpoint.setCharsetName(getEncodingParameter("MinaProducer", encoding).name());
+ }
+ // set sync or async mode after endpoint is created
+ if (sync) {
+ endpoint.setExchangePattern(ExchangePattern.InOut);
+ } else {
+ endpoint.setExchangePattern(ExchangePattern.InOnly);
+ }
+
+ return endpoint;
}
protected MinaEndpoint createSocketEndpoint(String uri, URI connectUri, Map parameters) {
@@ -123,7 +147,7 @@
// connector config
SocketConnectorConfig connectorConfig = new SocketConnectorConfig();
- configureSocketCodecFactory("MinaProducer", connectorConfig, textline, encoding, codec);
+ configureCodecFactory("MinaProducer", connectorConfig, textline, encoding, codec);
if (minaLogger) {
connectorConfig.getFilterChain().addLast("logger", new LoggingFilter());
}
@@ -133,7 +157,7 @@
// acceptor connectorConfig
SocketAcceptorConfig acceptorConfig = new SocketAcceptorConfig();
- configureSocketCodecFactory("MinaConsumer", acceptorConfig, textline, encoding, codec);
+ configureCodecFactory("MinaConsumer", acceptorConfig, textline, encoding, codec);
acceptorConfig.setReuseAddress(true);
acceptorConfig.setDisconnectOnUnbind(true);
if (minaLogger) {
@@ -154,7 +178,7 @@
return endpoint;
}
- protected void configureSocketCodecFactory(String type, IoServiceConfig config, boolean textline, String encoding, String codec) {
+ protected void configureCodecFactory(String type, IoServiceConfig config, boolean textline, String encoding, String codec) {
ProtocolCodecFactory codecFactory = getCodecFactory(type, codec);
if (codecFactory == null) {
@@ -217,7 +241,7 @@
return endpoint;
}
- private Charset getEncodingParameter(String type, String encoding) {
+ private static Charset getEncodingParameter(String type, String encoding) {
if (encoding == null) {
encoding = Charset.defaultCharset().name();
if (LOG.isDebugEnabled()) {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java?rev=726640&r1=726639&r2=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java Sun Dec 14 23:58:48 2008
@@ -23,6 +23,7 @@
import org.apache.camel.impl.JndiRegistry;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -41,7 +42,8 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Bye World");
- template.requestBody(uri, "Hello World");
+ Object out = template.requestBody(uri, "Hello World");
+ assertEquals("Bye World", out);
mock.assertIsSatisfied();
}
@@ -90,20 +92,15 @@
}
public ProtocolDecoder getDecoder() throws Exception {
- return new ProtocolDecoder() {
- public void decode(IoSession ioSession, ByteBuffer in,
- ProtocolDecoderOutput out) throws Exception {
- in.acquire();
- out.write(in);
- }
-
- public void finishDecode(IoSession ioSession, ProtocolDecoderOutput protocolDecoderOutput)
- throws Exception {
- // do nothing
- }
-
- public void dispose(IoSession ioSession) throws Exception {
- // do nothing
+ return new CumulativeProtocolDecoder() {
+ protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) throws Exception {
+ if (in.remaining() > 0) {
+ byte[] buf = MinaConverter.toByteArray(in);
+ out.write(new String(buf));
+ return true;
+ } else {
+ return false;
+ }
}
};
}
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java?rev=726640&r1=726639&r2=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java Sun Dec 14 23:58:48 2008
@@ -36,7 +36,7 @@
*/
public class MinaTransferExchangeOptionTest extends ContextTestSupport {
- private static final String URI = "mina:tcp://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
+ protected String uri = "mina:tcp://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
public void testMianTransferExchangeOptionWithoutException() throws Exception {
Exchange exchange = sendExchange(false);
@@ -49,7 +49,7 @@
}
private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint(URI);
+ Endpoint endpoint = context.getEndpoint(uri);
Exchange exchange = endpoint.createExchange();
Message message = exchange.getIn();
@@ -92,7 +92,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(URI).process(new Processor() {
+ from(uri).process(new Processor() {
public void process(Exchange e) throws InterruptedException {
Assert.assertNotNull(e.getIn().getBody());
Assert.assertNotNull(e.getIn().getHeaders());
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java (from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java&r1=726617&r2=726640&rev=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java Sun Dec 14 23:58:48 2008
@@ -23,6 +23,7 @@
import org.apache.camel.impl.JndiRegistry;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -30,25 +31,26 @@
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
/**
- * Unit test with custom codec.
+ * Unit test with custom codec using the VM protocol.
*/
-public class MinaCustomCodecTest extends ContextTestSupport {
+public class MinaVMCustomCodecTest extends ContextTestSupport {
- private String uri = "mina:tcp://localhost:11300?sync=true&codec=myCodec";
+ private String uri = "mina:vm://localhost:11301?sync=true&codec=myCodec";
public void testMyCodec() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Bye World");
- template.requestBody(uri, "Hello World");
+ Object out = template.requestBody(uri, "Hello World");
+ assertEquals("Bye World", out);
mock.assertIsSatisfied();
}
public void testBadConfiguration() throws Exception {
try {
- template.sendBody("mina:tcp://localhost:11300?sync=true&codec=XXX", "Hello World");
+ template.sendBody("mina:vm://localhost:11300?sync=true&codec=XXX", "Hello World");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
// ok
@@ -90,23 +92,18 @@
}
public ProtocolDecoder getDecoder() throws Exception {
- return new ProtocolDecoder() {
- public void decode(IoSession ioSession, ByteBuffer in,
- ProtocolDecoderOutput out) throws Exception {
- in.acquire();
- out.write(in);
- }
-
- public void finishDecode(IoSession ioSession, ProtocolDecoderOutput protocolDecoderOutput)
- throws Exception {
- // do nothing
- }
-
- public void dispose(IoSession ioSession) throws Exception {
- // do nothing
+ return new CumulativeProtocolDecoder() {
+ protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) throws Exception {
+ if (in.remaining() > 0) {
+ byte[] buf = MinaConverter.toByteArray(in);
+ out.write(new String(buf));
+ return true;
+ } else {
+ return false;
+ }
}
};
}
}
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java (from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java&r1=726617&r2=726640&rev=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java Sun Dec 14 23:58:48 2008
@@ -23,7 +23,7 @@
/**
* @version $Revision$
*/
-public class MinaFileTcpTest extends ContextTestSupport {
+public class MinaVMFileTcpTest extends ContextTestSupport {
public void testMinaRoute() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:results");
@@ -36,10 +36,10 @@
return new RouteBuilder() {
public void configure() {
// lets setup a server
- from("mina:tcp://localhost:9123").to("mock:results");
+ from("mina:vm://localhost:9123").to("mock:results");
from("file:src/test/data?noop=true").
- to("mina:tcp://localhost:9123");
+ to("mina:vm://localhost:9123");
}
};
}
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java (from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java&r1=726617&r2=726640&rev=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java Sun Dec 14 23:58:48 2008
@@ -19,10 +19,10 @@
/**
* @version $Revision$
*/
-public class MinaTcpTextlineProtocolTest extends MinaVmTest {
+public class MinaVMTextlineProtocolTest extends MinaVmTest {
@Override
protected void setUp() throws Exception {
- uri = "mina:tcp://localhost:6124?textline=true&sync=false";
+ uri = "mina:vm://localhost:6124?textline=true&sync=false";
super.setUp();
}
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java (from r726617, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java&r1=726617&r2=726640&rev=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java Sun Dec 14 23:58:48 2008
@@ -16,105 +16,17 @@
*/
package org.apache.camel.component.mina;
-import java.nio.charset.Charset;
-
-import junit.framework.Assert;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.builder.RouteBuilder;
-
/**
* Unit test for the <tt>transferExchange=true</tt> option.
*
* @version $Revision$
*/
-public class MinaTransferExchangeOptionTest extends ContextTestSupport {
+public class MinaVMTransferExchangeOptionTest extends MinaTransferExchangeOptionTest {
- private static final String URI = "mina:tcp://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
-
- public void testMianTransferExchangeOptionWithoutException() throws Exception {
- Exchange exchange = sendExchange(false);
- assertExchange(exchange, false);
+ @Override
+ protected void setUp() throws Exception {
+ uri = "mina:vm://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
+ super.setUp();
}
- public void testMinaTransferExchangeOptionWithException() throws Exception {
- Exchange exchange = sendExchange(true);
- assertExchange(exchange, true);
- }
-
- private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint(URI);
- Exchange exchange = endpoint.createExchange();
-
- Message message = exchange.getIn();
- message.setBody("Hello!");
- message.setHeader("cheese", "feta");
- exchange.setProperty("ham", "old");
- exchange.setProperty("setException", setException);
-
- Producer producer = endpoint.createProducer();
- producer.start();
- producer.process(exchange);
-
- return exchange;
- }
-
- private void assertExchange(Exchange exchange, boolean hasFault) {
- if (!hasFault) {
- Message out = exchange.getOut();
- assertNotNull(out);
- assertEquals("Goodbye!", out.getBody());
- assertEquals("cheddar", out.getHeader("cheese"));
- } else {
- Message fault = exchange.getFault();
- assertNotNull(fault.getBody());
- assertTrue("Should get the InterrupteException exception", fault.getBody() instanceof InterruptedException);
- assertEquals("nihao", fault.getHeader("hello"));
- }
-
-
- // in should stay the same
- Message in = exchange.getIn();
- assertNotNull(in);
- assertEquals("Hello!", in.getBody());
- assertEquals("feta", in.getHeader("cheese"));
- // however the shared properties have changed
- assertEquals("fresh", exchange.getProperty("salami"));
- assertNull(exchange.getProperty("Charset"));
- }
-
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- public void configure() {
- from(URI).process(new Processor() {
- public void process(Exchange e) throws InterruptedException {
- Assert.assertNotNull(e.getIn().getBody());
- Assert.assertNotNull(e.getIn().getHeaders());
- Assert.assertNotNull(e.getProperties());
- Assert.assertEquals("Hello!", e.getIn().getBody());
- Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
- Assert.assertEquals("old", e.getProperty("ham"));
- Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
- Boolean setException = (Boolean) e.getProperty("setException");
-
- if (setException) {
- e.getFault().setBody(new InterruptedException());
- e.getFault().setHeader("hello", "nihao");
- } else {
- e.getOut().setBody("Goodbye!");
- e.getOut().setHeader("cheese", "cheddar");
- }
- e.setProperty("salami", "fresh");
- e.setProperty("Charset", Charset.defaultCharset());
- }
- });
- }
- };
- }
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties?rev=726640&r1=726639&r2=726640&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties Sun Dec 14 23:58:48 2008
@@ -32,4 +32,5 @@
log4j.appender.file.file=target/camel-mina-test.log
# debug logging for camel-mina
-#log4j.logger.org.apache.camel.component.mina=DEBUG
+log4j.logger.org.apache.camel.component.mina=DEBUG
+#log4j.logger.org.apache.camel=DEBUG