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 2015/03/06 18:09:38 UTC
camel git commit: Use mina2 for testing camel-syslog
Repository: camel
Updated Branches:
refs/heads/master c3b6f810c -> c45459fcf
Use mina2 for testing camel-syslog
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c45459fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c45459fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c45459fc
Branch: refs/heads/master
Commit: c45459fcff061ff2b5cd67dd20c51f2a2873eaf6
Parents: c3b6f81
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 6 18:11:00 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 6 18:11:00 2015 +0100
----------------------------------------------------------------------
components/camel-syslog/pom.xml | 2 +-
.../apache/camel/component/syslog/AutomatedConversionTest.java | 2 +-
.../org/apache/camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../apache/camel/component/syslog/MinaManyUDPMessagesTest.java | 2 +-
.../apache/camel/component/syslog/applicationContext-Mina.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c45459fc/components/camel-syslog/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 16b00f5..9dafb42 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina</artifactId>
+ <artifactId>camel-mina2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c45459fc/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index 6b762d9..e707bb6 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -80,7 +80,7 @@ public class AutomatedConversionTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal().syslog().process(new Processor() {
+ from("mina2:udp://127.0.0.1:" + serverPort).unmarshal().syslog().process(new Processor() {
@Override
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
http://git-wip-us.apache.org/repos/asf/camel/blob/c45459fc/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index af43b5a..678ec55 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -79,7 +79,7 @@ public class MinaDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina2:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c45459fc/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index 2990234..704c1bb 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -76,7 +76,7 @@ public class MinaManyUDPMessagesTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina2:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c45459fc/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
index 68839fd..571322d 100644
--- a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
+++ b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Mina.xml
@@ -25,7 +25,7 @@
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
</bean>
- <bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
+ <bean id="myMinaFactory" class="org.apache.camel.component.mina2.Mina2Component">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
</bean>
@@ -38,7 +38,7 @@
</bean>
<!-- this is our mina configuration with plain properties -->
- <bean id="minaSyslogConfig" class="org.apache.camel.component.mina.MinaConfiguration">
+ <bean id="minaSyslogConfig" class="org.apache.camel.component.mina2.Mina2Configuration">
<property name="protocol" value="udp"/>
<property name="host" value="localhost"/>
<property name="port" value="${server-port}"/>