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/03 12:53:48 UTC
svn commit: r722845 - in /activemq/camel/trunk/components/camel-mina/src:
main/java/org/apache/camel/component/mina/
test/java/org/apache/camel/component/mina/
Author: davsclaus
Date: Wed Dec 3 03:53:48 2008
New Revision: 722845
URL: http://svn.apache.org/viewvc?rev=722845&view=rev
Log:
CAMEL-1141: Added textlineDelimiter option for textline codec.
Added:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java (with props)
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java (with props)
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
- copied, changed from r722791, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java (contents, props changed)
- copied, changed from r722791, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java (contents, props changed)
- copied, changed from r722791, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.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/MinaTcpWithInOutUsingPlainSocketTest.java
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=722845&r1=722844&r2=722845&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 Wed Dec 3 03:53:48 2008
@@ -44,7 +44,7 @@
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
-import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
+import org.apache.mina.filter.codec.textline.LineDelimiter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
import org.apache.mina.transport.socket.nio.DatagramConnector;
@@ -68,6 +68,7 @@
private static final long DEFAULT_CONNECT_TIMEOUT = 30000;
private boolean sync = true;
private boolean textline;
+ private TextLineDelimiter textlineDelimiter;
private String codec;
private String encoding;
private long timeout;
@@ -159,10 +160,11 @@
if (codecFactory == null) {
if (textline) {
Charset charset = getEncodingParameter(type, encoding);
- codecFactory = new TextLineCodecFactory(charset);
+ LineDelimiter delimiter = getLineDelimiterParameter();
+ codecFactory = new TextLineCodecFactory(charset, delimiter);
if (LOG.isDebugEnabled()) {
LOG.debug(type + ": Using TextLineCodecFactory: " + codecFactory + " using encoding: "
- + encoding);
+ + charset + " and line delimiter: " + textlineDelimiter + "(" + delimiter + ")");
}
} else {
codecFactory = new ObjectSerializationCodecFactory();
@@ -277,7 +279,7 @@
encoder = charset.newEncoder();
if (LOG.isDebugEnabled()) {
- LOG.debug(type + ": Using CodecFactory: " + codecFactory + " using encoding: " + encoding);
+ LOG.debug(type + ": Using CodecFactory: " + codecFactory + " using encoding: " + charset);
}
}
@@ -311,6 +313,25 @@
config.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory));
}
+ private LineDelimiter getLineDelimiterParameter() {
+ if (textlineDelimiter == null) {
+ return LineDelimiter.AUTO;
+ }
+
+ switch (textlineDelimiter) {
+ case AUTO:
+ return LineDelimiter.AUTO;
+ case UNIX:
+ return LineDelimiter.UNIX;
+ case WINDOWS:
+ return LineDelimiter.WINDOWS;
+ case MAC:
+ return LineDelimiter.MAC;
+ default:
+ throw new IllegalArgumentException("Unknown textline delimiter: " + textlineDelimiter);
+ }
+ }
+
// Properties
//-------------------------------------------------------------------------
@@ -330,6 +351,14 @@
this.textline = textline;
}
+ public TextLineDelimiter getTextlineDelimiter() {
+ return textlineDelimiter;
+ }
+
+ public void setTextlineDelimiter(TextLineDelimiter textlineDelimiter) {
+ this.textlineDelimiter = textlineDelimiter;
+ }
+
public String getCodec() {
return codec;
}
@@ -377,4 +406,5 @@
public void setMinaLogger(boolean minaLogger) {
this.minaLogger = minaLogger;
}
+
}
Added: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java?rev=722845&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java (added)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java Wed Dec 3 03:53:48 2008
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mina;
+
+import java.nio.charset.Charset;
+
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.textline.LineDelimiter;
+import org.apache.mina.filter.codec.textline.TextLineDecoder;
+import org.apache.mina.filter.codec.textline.TextLineEncoder;
+
+/**
+ * Text line codec that supports setting charset and delimiter.
+ * <p/>
+ * Uses Mina's default TextLineEncoder and TextLineDncoder.
+ */
+public class TextLineCodecFactory implements ProtocolCodecFactory {
+
+ private ProtocolEncoder encoder;
+ private ProtocolDecoder decoder;
+
+ public TextLineCodecFactory(Charset charset, LineDelimiter delimiter) {
+ if (delimiter.equals(LineDelimiter.AUTO)) {
+ // AUTO not supported by encoder
+ encoder = new TextLineEncoder(charset);
+ } else {
+ encoder = new TextLineEncoder(charset, delimiter);
+ }
+ decoder = new TextLineDecoder(charset, delimiter);
+ }
+
+ public ProtocolEncoder getEncoder() throws Exception {
+ return encoder;
+ }
+
+ public ProtocolDecoder getDecoder() throws Exception {
+ return decoder;
+ }
+
+}
Propchange: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineCodecFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java?rev=722845&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java (added)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java Wed Dec 3 03:53:48 2008
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mina;
+
+/**
+ * Possible text line delmiters to be used with the textline codec.
+ */
+public enum TextLineDelimiter {
+ AUTO, UNIX, WINDOWS, MAC
+}
Propchange: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/TextLineDelimiter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java (from r722791, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java&r1=722791&r2=722845&rev=722845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java Wed Dec 3 03:53:48 2008
@@ -24,18 +24,19 @@
/**
* Unit test to verify that MINA can be used with an InOut MEP but still use sync to send and receive data
- * from a remote server.
+ * from a remote server and using MAC textline delimiter.
*/
-public class MinaInOutRouteTest extends ContextTestSupport {
+public class MinaInOutRouteTextLineDelimiterTest extends ContextTestSupport {
+
+ private String uri = "mina:tcp://localhost:8080?sync=true&textline=true&textlineDelimiter=MAC";
public void testInOutUsingMina() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye Claus");
// we should preserve headers
- mock.expectedHeaderReceived("city", "Copenhagen");
mock.setResultWaitTime(5000);
- Object out = template.requestBodyAndHeader("direct:in", "Claus", "city", "Copenhagen");
+ Object out = template.requestBody(uri, "Claus");
assertMockEndpointsSatisfied();
assertEquals("Bye Claus", out);
@@ -45,16 +46,12 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina:tcp://localhost:8080?sync=true").process(new Processor() {
+ from(uri).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
}
- });
-
- from("direct:in")
- .to("mina:tcp://localhost:8080?sync=true")
- .to("mock:result");
+ }).to("mock:result");
}
};
}
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java (from r722791, activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java&r1=722791&r2=722845&rev=722845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java Wed Dec 3 03:53:48 2008
@@ -32,11 +32,12 @@
*
* @version $Revision$
*/
-public class MinaTcpWithInOutUsingPlainSocketTest extends ContextTestSupport {
+public class MinaTcpLineDelimiterUsingPlainSocketTest extends ContextTestSupport {
- private static final int PORT = 6333;
+ private static final int PORT = 6334;
// use parameter sync=true to force InOut pattern of the MinaExchange
- protected String uri = "mina:tcp://localhost:" + PORT + "?textline=true&sync=true";
+ // use MAC textline delimiter
+ protected String uri = "mina:tcp://localhost:" + PORT + "?textline=true&textlineDelimiter=MAC&sync=true";
public void testSendAndReceiveOnce() throws Exception {
String response = sendAndReceive("World");
@@ -85,8 +86,8 @@
InputStream is = null;
try {
os = soc.getOutputStream();
- // must append newline at the end to flag end of textline to Camel-Mina
- os.write((input + "\n").getBytes());
+ // must append MAC newline at the end to flag end of textline to Camel-Mina
+ os.write((input + "\r").getBytes());
is = soc.getInputStream();
int len = is.read(buf);
@@ -108,8 +109,8 @@
StringBuffer sb = new StringBuffer();
for (byte b : buf) {
char ch = (char) b;
- if (ch == '\n' || ch == 0) {
- // newline denotes end of text (added in the end in the processor below)
+ if (ch == '\r' || ch == 0) {
+ // use MAC delimiter denotes end of text (added in the end in the processor below)
break;
} else {
sb.append(ch);
@@ -133,8 +134,7 @@
e.getOut().setBody(null);
throw new IllegalArgumentException("Forced exception");
} else {
- // append newline as stop character for textline codec
- e.getOut().setBody("Hello " + in + "\n");
+ e.getOut().setBody("Hello " + in);
}
}
});
@@ -142,4 +142,4 @@
};
}
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java (from r722791, 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/MinaTcpTextlineDelimiterTest.java?p2=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java&p1=activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java&r1=722791&r2=722845&rev=722845&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/MinaTcpTextlineDelimiterTest.java Wed Dec 3 03:53:48 2008
@@ -19,10 +19,10 @@
/**
* @version $Revision$
*/
-public class MinaTcpTextlineProtocolTest extends MinaVmTest {
+public class MinaTcpTextlineDelimiterTest extends MinaVmTest {
@Override
protected void setUp() throws Exception {
- uri = "mina:tcp://localhost:6124?textline=true";
+ uri = "mina:tcp://localhost:6124?textline=true&textlineDelimiter=UNIX";
super.setUp();
}
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java?rev=722845&r1=722844&r2=722845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java Wed Dec 3 03:53:48 2008
@@ -133,8 +133,7 @@
e.getOut().setBody(null);
throw new IllegalArgumentException("Forced exception");
} else {
- // append newline as stop character for textline codec
- e.getOut().setBody("Hello " + in + "\n");
+ e.getOut().setBody("Hello " + in);
}
}
});