You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/08/16 22:34:33 UTC
[camel] branch master updated: cleanups for camel-mina2 to
camel-mina component renaming
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fdd8fc5 cleanups for camel-mina2 to camel-mina component renaming
fdd8fc5 is described below
commit fdd8fc53a184f73614d4797a99d30e1b7cb1a03f
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat Aug 17 00:33:53 2019 +0200
cleanups for camel-mina2 to camel-mina component renaming
---
components/camel-mina/pom.xml | 4 +-
.../camel-mina/src/main/docs/mina-component.adoc | 20 +-
.../MinaComponent.java} | 26 +-
.../MinaConfiguration.java} | 20 +-
.../MinaConstants.java} | 14 +-
.../Mina2Consumer.java => mina/MinaConsumer.java} | 62 ++--
.../MinaConverter.java} | 10 +-
.../Mina2Endpoint.java => mina/MinaEndpoint.java} | 26 +-
.../Mina2Helper.java => mina/MinaHelper.java} | 10 +-
.../MinaPayloadHelper.java} | 12 +-
.../Mina2Producer.java => mina/MinaProducer.java} | 42 +--
.../MinaTextLineCodecFactory.java} | 8 +-
.../MinaTextLineDelimiter.java} | 6 +-
.../MinaUdpProtocolCodecFactory.java} | 6 +-
.../BaseMina2Test.java => mina/BaseMinaTest.java} | 4 +-
.../{mina2 => mina}/MessageIOSessionTest.java | 12 +-
.../MinaClientModeTcpTextlineDelimiterTest.java} | 16 +-
.../MinaClientServerTest.java} | 6 +-
.../MinaComponentTest.java} | 4 +-
.../MinaComponentWithConfigurationTest.java} | 14 +-
.../MinaConsumerTest.java} | 4 +-
.../MinaConverterTest.java} | 18 +-
.../MinaCustomCodecTest.java} | 4 +-
.../MinaDisconnectRaceConditionTest.java} | 8 +-
.../MinaDisconnectTest.java} | 6 +-
.../MinaEncodingTest.java} | 5 +-
.../MinaExchangeDefaultTimeOutTest.java} | 6 +-
.../MinaExchangeTimeOutTest.java} | 6 +-
.../MinaFileTcpTest.java} | 6 +-
.../MinaFileUdpTest.java} | 6 +-
.../MinaFiltersTest.java} | 4 +-
.../MinaInOnlyRouteTest.java} | 4 +-
.../MinaInOutCloseSessionWhenCompleteTest.java} | 8 +-
.../MinaInOutRouteTest.java} | 6 +-
.../MinaInOutRouteTextLineDelimiterTest.java} | 6 +-
.../MinaInOutWithForcedNoResponseTest.java} | 6 +-
.../MinaMaxLineLengthTest.java} | 4 +-
.../MinaNoDefaultCodecTest.java} | 8 +-
.../MinaNoResponseFromServerTest.java} | 4 +-
.../MinaProducerAnotherConcurrentTest.java} | 4 +-
.../MinaProducerConcurrentTest.java} | 4 +-
.../MinaProducerShutdownMockTest.java} | 6 +-
.../MinaProducerShutdownTest.java} | 6 +-
.../MinaReverseProtocolHandler.java} | 4 +-
.../MinaReverserServer.java} | 8 +-
.../MinaSendToProcessorTest.java} | 4 +-
.../MinaSpringMinaEndpointTest.java} | 8 +-
.../MinaSpringMinaEndpointUDPTest.java} | 6 +-
.../MinaSpringMultipleUDPTest.java} | 6 +-
.../MinaSslContextParametersTcpTest.java} | 6 +-
.../MinaSslContextParametersUdpTest.java} | 8 +-
.../MinaSslContextParametersVmTest.java} | 6 +-
.../MinaSslGlobalContextParametersTcpTest.java} | 6 +-
.../MinaTcpLineDelimiterUsingPlainSocketTest.java} | 10 +-
.../Mina2TcpTest.java => mina/MinaTcpTest.java} | 6 +-
.../MinaTcpTextlineDelimiterTest.java} | 6 +-
.../MinaTcpTextlineProtocolTest.java} | 4 +-
.../MinaTcpWithInOutTest.java} | 8 +-
.../MinaTcpWithInOutUsingPlainSocketTest.java} | 14 +-
.../MinaTcpWithIoOutProcessorExceptionTest.java} | 4 +-
.../MinaTransferExchangeOptionTest.java} | 6 +-
.../MinaUdpConcurrentTest.java} | 6 +-
.../MinaUdpNoCamelTest.java} | 8 +-
.../Mina2UdpTest.java => mina/MinaUdpTest.java} | 6 +-
.../MinaUdpUsingTemplateTest.java} | 4 +-
.../MinaUdpWithInOutUsingPlainSocketTest.java} | 6 +-
.../MinaVMCustomCodecTest.java} | 4 +-
.../MinaVMFileTcpTest.java} | 6 +-
.../MinaVMTextlineProtocolTest.java} | 6 +-
.../MinaVMTransferExchangeOptionTest.java} | 6 +-
.../Mina2VmTest.java => mina/MinaVmTest.java} | 4 +-
.../SpringMinaEndpointTest-context.xml | 4 +-
.../SpringMinaEndpointUDPTest-context.xml | 4 +-
.../SpringMultipleUDPTest-context.xml | 4 +-
components/camel-mllp/README.md | 4 +-
components/camel-quickfix/pom.xml | 2 +-
.../component/syslog/applicationContext-Mina.xml | 4 +-
.../builder/endpoint/EndpointBuilderFactory.java | 2 +-
...actory.java => MinaEndpointBuilderFactory.java} | 343 ++++++++++-----------
.../modules/ROOT/pages/ahc-component.adoc | 1 -
.../modules/ROOT/pages/jpa-component.adoc | 2 -
.../modules/ROOT/pages/mina-component.adoc | 20 +-
docs/user-manual/modules/ROOT/pages/delay-eip.adoc | 1 -
parent/pom.xml | 4 +-
.../karaf/features/src/main/resources/features.xml | 12 +-
.../MinaComponentAutoConfiguration.java} | 24 +-
.../springboot/MinaComponentConfiguration.java} | 23 +-
.../src/main/resources/META-INF/spring.factories | 3 +-
.../camel/itest/springboot/CamelMinaTest.java | 2 +-
tests/camel-itest/pom.xml | 4 +-
90 files changed, 547 insertions(+), 553 deletions(-)
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index fd8d5c30..b444c4e 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -95,7 +95,7 @@
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<excludes>
<!-- This test just show the shutdown error -->
- <exclude>**/Mina2ProducerShutdownTest.*</exclude>
+ <exclude>**/MinaProducerShutdownTest.*</exclude>
</excludes>
</configuration>
</plugin>
@@ -105,7 +105,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
- <mainClass>org.apache.camel.component.mina2.Mina2ProducerShutdownTest</mainClass>
+ <mainClass>org.apache.camel.component.mina.MinaProducerShutdownTest</mainClass>
<includePluginDependencies>false</includePluginDependencies>
</configuration>
</plugin>
diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
index f39cdf5..d87df26 100644
--- a/components/camel-mina/src/main/docs/mina-component.adoc
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -3,7 +3,7 @@
*Available as of Camel version 2.10*
-The Mina2 component is a transport for working with
+The Mina component is a transport for working with
http://mina.apache.org/[Apache MINA 2.x]
TIP: Favor using xref:netty-component.adoc[Netty] as Netty is a much more active
@@ -71,7 +71,7 @@ The Mina component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *configuration* (advanced) | To use the shared mina configuration. | | Mina2Configuration
+| *configuration* (advanced) | To use the shared mina configuration. | | MinaConfiguration
| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
|===
@@ -137,7 +137,7 @@ with the following path and query parameters:
| *encoding* (codec) | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
| *filters* (codec) | You can set a list of Mina IoFilters to use. | | List
| *textline* (codec) | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | boolean
-| *textlineDelimiter* (codec) | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *textlineDelimiter* (codec) | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | MinaTextLineDelimiter
| *autoStartTls* (security) | Whether to auto start SSL handshake. | true | boolean
| *sslContextParameters* (security) | To configure SSL security. | | SSLContextParameters
|===
@@ -188,7 +188,7 @@ The component supports 29 options, which are listed below.
| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | MinaTextLineDelimiter
| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
@@ -227,9 +227,9 @@ it on port 6200.
-------------------------------------------------------------------------------------------------
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
-
+
template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
-
+
assertMockEndpointsSatisfied();
-------------------------------------------------------------------------------------------------
@@ -303,7 +303,7 @@ written the `bye` message back to the client:
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
- exchange.getOut().setHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
+ exchange.getOut().setHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
}
});
---------------------------------------------------------------------------------------------------
@@ -311,9 +311,9 @@ written the `bye` message back to the client:
== Get the IoSession for message
You can get the IoSession from the message header with this key
-`Mina2Constants.MINA_IOSESSION`, and also get the local host address
-with the key `Mina2Constants.MINA_LOCAL_ADDRESS` and remote host address
-with the key `Mina2Constants.MINA_REMOTE_ADDRESS`.
+`MinaConstants.MINA_IOSESSION`, and also get the local host address
+with the key `MinaConstants.MINA_LOCAL_ADDRESS` and remote host address
+with the key `MinaConstants.MINA_REMOTE_ADDRESS`.
== Configuring Mina filters
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
similarity index 84%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
index 4362864..3f3b703 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.URI;
import java.util.Map;
@@ -33,18 +33,18 @@ import org.apache.mina.core.filterchain.IoFilter;
* Component for Apache MINA 2.x.
*/
@Component("mina")
-public class Mina2Component extends DefaultComponent implements SSLContextParametersAware {
+public class MinaComponent extends DefaultComponent implements SSLContextParametersAware {
@Metadata(label = "advanced")
- private Mina2Configuration configuration;
+ private MinaConfiguration configuration;
@Metadata(label = "security", defaultValue = "false")
private boolean useGlobalSslContextParameters;
- public Mina2Component() {
+ public MinaComponent() {
super();
}
- public Mina2Component(CamelContext context) {
+ public MinaComponent(CamelContext context) {
super(context);
}
@@ -56,11 +56,11 @@ public class Mina2Component extends DefaultComponent implements SSLContextParame
// Using the configuration which set by the component as a default one
// Since the configuration's properties will be set by the URI
// we need to copy or create a new MinaConfiguration here
- Mina2Configuration config;
+ MinaConfiguration config;
if (configuration != null) {
config = configuration.copy();
} else {
- config = new Mina2Configuration();
+ config = new MinaConfiguration();
}
URI u = new URI(remaining);
@@ -77,19 +77,19 @@ public class Mina2Component extends DefaultComponent implements SSLContextParame
return createEndpoint(uri, config);
}
- public Endpoint createEndpoint(Mina2Configuration config) throws Exception {
+ public Endpoint createEndpoint(MinaConfiguration config) throws Exception {
return createEndpoint(config.getUriString(), config);
}
- private Endpoint createEndpoint(String uri, Mina2Configuration config) throws Exception {
+ private Endpoint createEndpoint(String uri, MinaConfiguration config) throws Exception {
ObjectHelper.notNull(getCamelContext(), "camelContext");
String protocol = config.getProtocol();
// if mistyped uri then protocol can be null
- Mina2Endpoint endpoint = null;
+ MinaEndpoint endpoint = null;
if (protocol != null) {
if (protocol.equals("tcp") || config.isDatagramProtocol() || protocol.equals("vm")) {
- endpoint = new Mina2Endpoint(uri, this, config);
+ endpoint = new MinaEndpoint(uri, this, config);
}
}
if (endpoint == null) {
@@ -109,14 +109,14 @@ public class Mina2Component extends DefaultComponent implements SSLContextParame
// Properties
//-------------------------------------------------------------------------
- public Mina2Configuration getConfiguration() {
+ public MinaConfiguration getConfiguration() {
return configuration;
}
/**
* To use the shared mina configuration.
*/
- public void setConfiguration(Mina2Configuration configuration) {
+ public void setConfiguration(MinaConfiguration configuration) {
this.configuration = configuration;
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
similarity index 96%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
index ec5055a..6010796 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.nio.charset.Charset;
import java.util.List;
@@ -30,10 +30,10 @@ import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
/**
- * Mina2 configuration
+ * Mina configuration
*/
@UriParams
-public class Mina2Configuration implements Cloneable {
+public class MinaConfiguration implements Cloneable {
@UriPath @Metadata(required = true)
private String protocol;
@@ -46,7 +46,7 @@ public class Mina2Configuration implements Cloneable {
@UriParam(label = "codec")
private boolean textline;
@UriParam(label = "codec")
- private Mina2TextLineDelimiter textlineDelimiter;
+ private MinaTextLineDelimiter textlineDelimiter;
@UriParam(label = "codec")
private ProtocolCodecFactory codec;
@UriParam(label = "codec")
@@ -91,9 +91,9 @@ public class Mina2Configuration implements Cloneable {
/**
* Returns a copy of this configuration
*/
- public Mina2Configuration copy() {
+ public MinaConfiguration copy() {
try {
- return (Mina2Configuration) clone();
+ return (MinaConfiguration) clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
@@ -166,7 +166,7 @@ public class Mina2Configuration implements Cloneable {
this.textline = textline;
}
- public Mina2TextLineDelimiter getTextlineDelimiter() {
+ public MinaTextLineDelimiter getTextlineDelimiter() {
return textlineDelimiter;
}
@@ -175,7 +175,7 @@ public class Mina2Configuration implements Cloneable {
* If none provided, Camel will use DEFAULT.
* This delimiter is used to mark the end of text.
*/
- public void setTextlineDelimiter(Mina2TextLineDelimiter textlineDelimiter) {
+ public void setTextlineDelimiter(MinaTextLineDelimiter textlineDelimiter) {
this.textlineDelimiter = textlineDelimiter;
}
@@ -404,12 +404,12 @@ public class Mina2Configuration implements Cloneable {
public void setClientMode(boolean clientMode) {
this.clientMode = clientMode;
}
-
+
public boolean isClientMode() {
return clientMode;
}
- // here we just shows the option setting of host, port, protocol
+ // here we just shows the option setting of host, port, protocol
public String getUriString() {
return "mina:" + getProtocol() + ":" + getHost() + ":" + getPort();
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
similarity index 75%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
index 7f8bf47..3b7b69e 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
/**
* Mina constants
*/
-public final class Mina2Constants {
+public final class MinaConstants {
- public static final String MINA_CLOSE_SESSION_WHEN_COMPLETE = "CamelMina2CloseSessionWhenComplete";
+ public static final String MINA_CLOSE_SESSION_WHEN_COMPLETE = "CamelMinaCloseSessionWhenComplete";
/** The key of the IoSession which is stored in the message header*/
- public static final String MINA_IOSESSION = "CamelMina2IoSession";
+ public static final String MINA_IOSESSION = "CamelMinaIoSession";
/** The socket address of local machine that received the message. */
- public static final String MINA_LOCAL_ADDRESS = "CamelMina2LocalAddress";
+ public static final String MINA_LOCAL_ADDRESS = "CamelMinaLocalAddress";
/** The socket address of the remote machine that send the message. */
- public static final String MINA_REMOTE_ADDRESS = "CamelMina2RemoteAddress";
+ public static final String MINA_REMOTE_ADDRESS = "CamelMinaRemoteAddress";
- private Mina2Constants() {
+ private MinaConstants() {
// Utility class
}
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
similarity index 89%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
index 885b222..b1327dd 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -59,21 +59,21 @@ import org.slf4j.LoggerFactory;
/**
* A {@link org.apache.camel.Consumer Consumer} implementation for Apache MINA.
*/
-public class Mina2Consumer extends DefaultConsumer {
+public class MinaConsumer extends DefaultConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(Mina2Consumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinaConsumer.class);
private IoSession session;
private IoConnector connector;
private SocketAddress address;
private IoAcceptor acceptor;
- private final Mina2Configuration configuration;
+ private final MinaConfiguration configuration;
private ExecutorService workerPool;
- public Mina2Consumer(final Mina2Endpoint endpoint, Processor processor) throws Exception {
+ public MinaConsumer(final MinaEndpoint endpoint, Processor processor) throws Exception {
super(endpoint, processor);
this.configuration = endpoint.getConfiguration();
//
- // All mina2 endpoints are InOut. The endpoints are asynchronous.
+ // All mina endpoints are InOut. The endpoints are asynchronous.
// Endpoints can send "n" messages and receive "m" messages.
//
this.getEndpoint().setExchangePattern(ExchangePattern.InOut);
@@ -144,10 +144,10 @@ public class Mina2Consumer extends DefaultConsumer {
}
super.doShutdown();
}
-
+
// Implementation methods
//-------------------------------------------------------------------------
- protected void setupVmProtocol(String uri, Mina2Configuration configuration) {
+ protected void setupVmProtocol(String uri, MinaConfiguration configuration) {
boolean minaLogger = configuration.isMinaLogger();
List<IoFilter> filters = configuration.getFilters();
@@ -156,7 +156,7 @@ public class Mina2Consumer extends DefaultConsumer {
acceptor = new VmPipeAcceptor();
// acceptor connectorConfig
- configureCodecFactory("Mina2Consumer", acceptor, configuration);
+ configureCodecFactory("MinaConsumer", acceptor, configuration);
if (minaLogger) {
acceptor.getFilterChain().addLast("logger", new LoggingFilter());
}
@@ -167,7 +167,7 @@ public class Mina2Consumer extends DefaultConsumer {
}
}
- protected void setupSocketProtocol(String uri, Mina2Configuration configuration) throws Exception {
+ protected void setupSocketProtocol(String uri, MinaConfiguration configuration) throws Exception {
LOG.debug("createSocketEndpoint");
boolean minaLogger = configuration.isMinaLogger();
List<IoFilter> filters = configuration.getFilters();
@@ -178,7 +178,7 @@ public class Mina2Consumer extends DefaultConsumer {
acceptor = new NioSocketAcceptor(processorCount);
// acceptor connectorConfig
- configureCodecFactory("Mina2Consumer", acceptor, configuration);
+ configureCodecFactory("MinaConsumer", acceptor, configuration);
((NioSocketAcceptor) acceptor).setReuseAddress(true);
acceptor.setCloseOnDeactivation(true);
@@ -198,8 +198,8 @@ public class Mina2Consumer extends DefaultConsumer {
acceptor.getFilterChain().addFirst("sslFilter", filter);
}
}
-
- protected void setupClientSocketProtocol(String uri, Mina2Configuration configuration) throws Exception {
+
+ protected void setupClientSocketProtocol(String uri, MinaConfiguration configuration) throws Exception {
boolean minaLogger = configuration.isMinaLogger();
long timeout = configuration.getTimeout();
List<IoFilter> filters = configuration.getFilters();
@@ -224,11 +224,11 @@ public class Mina2Consumer extends DefaultConsumer {
filter.setUseClientMode(true);
connector.getFilterChain().addFirst("sslFilter", filter);
}
- configureCodecFactory("Mina2Consumer", connector, configuration);
+ configureCodecFactory("MinaConsumer", connector, configuration);
connector.setConnectTimeoutMillis(timeout);
}
- protected void configureCodecFactory(String type, IoService service, Mina2Configuration configuration) {
+ protected void configureCodecFactory(String type, IoService service, MinaConfiguration configuration) {
if (configuration.getCodec() != null) {
addCodecFactory(service, configuration.getCodec());
} else if (configuration.isAllowDefaultCodec()) {
@@ -236,11 +236,11 @@ public class Mina2Consumer extends DefaultConsumer {
}
}
- protected void configureDefaultCodecFactory(String type, IoService service, Mina2Configuration configuration) {
+ protected void configureDefaultCodecFactory(String type, IoService service, MinaConfiguration configuration) {
if (configuration.isTextline()) {
Charset charset = getEncodingParameter(type, configuration);
LineDelimiter delimiter = getLineDelimiterParameter(configuration.getTextlineDelimiter());
- Mina2TextLineCodecFactory codecFactory = new Mina2TextLineCodecFactory(charset, delimiter);
+ MinaTextLineCodecFactory codecFactory = new MinaTextLineCodecFactory(charset, delimiter);
if (configuration.getEncoderMaxLineLength() > 0) {
codecFactory.setEncoderMaxLineLength(configuration.getEncoderMaxLineLength());
}
@@ -261,7 +261,7 @@ public class Mina2Consumer extends DefaultConsumer {
}
}
- protected void setupDatagramProtocol(String uri, Mina2Configuration configuration) {
+ protected void setupDatagramProtocol(String uri, MinaConfiguration configuration) {
boolean minaLogger = configuration.isMinaLogger();
List<IoFilter> filters = configuration.getFilters();
@@ -269,7 +269,7 @@ public class Mina2Consumer extends DefaultConsumer {
acceptor = new NioDatagramAcceptor();
// acceptor connectorConfig
- configureDataGramCodecFactory("Mina2Consumer", acceptor, configuration);
+ configureDataGramCodecFactory("MinaConsumer", acceptor, configuration);
acceptor.setCloseOnDeactivation(true);
// reuse address is default true for datagram
if (configuration.isOrderedThreadPoolExecutor()) {
@@ -292,10 +292,10 @@ public class Mina2Consumer extends DefaultConsumer {
* For datagrams the entire message is available as a single IoBuffer so lets just pass those around by default
* and try converting whatever they payload is into IoBuffer unless some custom converter is specified
*/
- protected void configureDataGramCodecFactory(final String type, final IoService service, final Mina2Configuration configuration) {
+ protected void configureDataGramCodecFactory(final String type, final IoService service, final MinaConfiguration configuration) {
ProtocolCodecFactory codecFactory = configuration.getCodec();
if (codecFactory == null) {
- codecFactory = new Mina2UdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
+ codecFactory = new MinaUdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
if (LOG.isDebugEnabled()) {
LOG.debug("{}: Using CodecFactory: {}", type, codecFactory);
@@ -309,7 +309,7 @@ public class Mina2Consumer extends DefaultConsumer {
service.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory));
}
- private static LineDelimiter getLineDelimiterParameter(Mina2TextLineDelimiter delimiter) {
+ private static LineDelimiter getLineDelimiterParameter(MinaTextLineDelimiter delimiter) {
if (delimiter == null) {
return LineDelimiter.DEFAULT;
}
@@ -330,7 +330,7 @@ public class Mina2Consumer extends DefaultConsumer {
}
}
- private Charset getEncodingParameter(String type, Mina2Configuration configuration) {
+ private Charset getEncodingParameter(String type, MinaConfiguration configuration) {
String encoding = configuration.getEncoding();
if (encoding == null) {
encoding = Charset.defaultCharset().name();
@@ -354,8 +354,8 @@ public class Mina2Consumer extends DefaultConsumer {
}
@Override
- public Mina2Endpoint getEndpoint() {
- return (Mina2Endpoint) super.getEndpoint();
+ public MinaEndpoint getEndpoint() {
+ return (MinaEndpoint) super.getEndpoint();
}
public IoAcceptor getAcceptor() {
@@ -417,11 +417,11 @@ public class Mina2Consumer extends DefaultConsumer {
boolean disconnect = getEndpoint().getConfiguration().isDisconnect();
Object response = null;
if (exchange.hasOut()) {
- response = Mina2PayloadHelper.getOut(getEndpoint(), exchange);
+ response = MinaPayloadHelper.getOut(getEndpoint(), exchange);
} else {
- response = Mina2PayloadHelper.getIn(getEndpoint(), exchange);
+ response = MinaPayloadHelper.getIn(getEndpoint(), exchange);
}
-
+
boolean failed = exchange.isFailed();
if (failed && !getEndpoint().getConfiguration().isTransferExchange()) {
if (exchange.getException() != null) {
@@ -434,7 +434,7 @@ public class Mina2Consumer extends DefaultConsumer {
if (response != null) {
LOG.debug("Writing body: {}", response);
- Mina2Helper.writeBody(session, response, exchange, configuration.getWriteTimeout());
+ MinaHelper.writeBody(session, response, exchange, configuration.getWriteTimeout());
} else {
LOG.debug("Writing no response");
disconnect = Boolean.TRUE;
@@ -443,9 +443,9 @@ public class Mina2Consumer extends DefaultConsumer {
// should session be closed after complete?
Boolean close;
if (ExchangeHelper.isOutCapable(exchange)) {
- close = exchange.getOut().getHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+ close = exchange.getOut().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
} else {
- close = exchange.getIn().getHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+ close = exchange.getIn().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
}
// should we disconnect, the header can override the configuration
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConverter.java
similarity index 90%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConverter.java
index e23bc1a..4b6dad4 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.io.InputStream;
@@ -26,12 +26,12 @@ import org.apache.camel.Exchange;
import org.apache.mina.core.buffer.IoBuffer;
/**
- * A set of converter methods for working with MINA2 types
+ * A set of converter methods for working with MINA types
*/
@Converter(loader = true)
-public final class Mina2Converter {
+public final class MinaConverter {
- private Mina2Converter() {
+ private MinaConverter() {
//Utility Class
}
@@ -40,7 +40,7 @@ public final class Mina2Converter {
byte[] answer = new byte[buffer.remaining()];
buffer.get(answer);
return answer;
- // we should not mark and reset the buffer with mina2
+ // we should not mark and reset the buffer with mina
}
@Converter
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
similarity index 74%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
index e5799ec..b0f927b 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -32,15 +32,15 @@ import org.apache.mina.core.session.IoSession;
* Socket level networking using TCP or UDP with the Apache Mina 2.x library.
*/
@UriEndpoint(firstVersion = "2.10.0", scheme = "mina", title = "Mina", syntax = "mina:protocol:host:port", label = "networking,tcp,udp")
-public class Mina2Endpoint extends DefaultEndpoint implements MultipleConsumersSupport {
+public class MinaEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
@UriParam
- private Mina2Configuration configuration;
+ private MinaConfiguration configuration;
- public Mina2Endpoint() {
+ public MinaEndpoint() {
}
- public Mina2Endpoint(String endpointUri, Component component, Mina2Configuration configuration) {
+ public MinaEndpoint(String endpointUri, Component component, MinaConfiguration configuration) {
super(endpointUri, component);
this.configuration = configuration;
}
@@ -48,23 +48,23 @@ public class Mina2Endpoint extends DefaultEndpoint implements MultipleConsumersS
@Override
public Producer createProducer() throws Exception {
ObjectHelper.notNull(configuration, "configuration");
- return new Mina2Producer(this);
+ return new MinaProducer(this);
}
@Override
public Consumer createConsumer(Processor processor) throws Exception {
ObjectHelper.notNull(configuration, "configuration");
- Mina2Consumer answer = new Mina2Consumer(this, processor);
+ MinaConsumer answer = new MinaConsumer(this, processor);
configureConsumer(answer);
return answer;
}
public Exchange createExchange(IoSession session, Object payload) {
Exchange exchange = createExchange();
- exchange.getIn().setHeader(Mina2Constants.MINA_IOSESSION, session);
- exchange.getIn().setHeader(Mina2Constants.MINA_LOCAL_ADDRESS, session.getLocalAddress());
- exchange.getIn().setHeader(Mina2Constants.MINA_REMOTE_ADDRESS, session.getRemoteAddress());
- Mina2PayloadHelper.setIn(exchange, payload);
+ exchange.getIn().setHeader(MinaConstants.MINA_IOSESSION, session);
+ exchange.getIn().setHeader(MinaConstants.MINA_LOCAL_ADDRESS, session.getLocalAddress());
+ exchange.getIn().setHeader(MinaConstants.MINA_REMOTE_ADDRESS, session.getRemoteAddress());
+ MinaPayloadHelper.setIn(exchange, payload);
return exchange;
}
@@ -76,11 +76,11 @@ public class Mina2Endpoint extends DefaultEndpoint implements MultipleConsumersS
// Properties
// -------------------------------------------------------------------------
- public Mina2Configuration getConfiguration() {
+ public MinaConfiguration getConfiguration() {
return configuration;
}
- public void setConfiguration(Mina2Configuration configuration) {
+ public void setConfiguration(MinaConfiguration configuration) {
this.configuration = configuration;
}
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
similarity index 93%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
index ec25451..16b7b81 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
@@ -24,13 +24,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Helper class used internally by camel-mina2 using Apache MINA.
+ * Helper class used internally by camel-mina using Apache MINA.
*/
-public final class Mina2Helper {
+public final class MinaHelper {
- private static final Logger LOG = LoggerFactory.getLogger(Mina2Helper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinaHelper.class);
- private Mina2Helper() {
+ private MinaHelper() {
//Utility Class
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
similarity index 90%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
index 531557f..3b4f103 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaPayloadHelper.java
@@ -14,25 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchangeHolder;
/**
- * Helper to get and set the correct payload when transferring data using camel-mina2.
+ * Helper to get and set the correct payload when transferring data using camel-mina.
* Always use this helper instead of direct access on the exchange object.
* <p/>
* This helper ensures that we can also transfer exchange objects over the wire using the
* <tt>transferExchange=true</tt> option.
*/
-public final class Mina2PayloadHelper {
+public final class MinaPayloadHelper {
- private Mina2PayloadHelper() {
+ private MinaPayloadHelper() {
//Utility Class
}
- public static Object getIn(Mina2Endpoint endpoint, Exchange exchange) {
+ public static Object getIn(MinaEndpoint endpoint, Exchange exchange) {
if (endpoint.getConfiguration().isTransferExchange()) {
// we should transfer the entire exchange over the wire (includes in/out)
return DefaultExchangeHolder.marshal(exchange);
@@ -42,7 +42,7 @@ public final class Mina2PayloadHelper {
}
}
- public static Object getOut(Mina2Endpoint endpoint, Exchange exchange) {
+ public static Object getOut(MinaEndpoint endpoint, Exchange exchange) {
if (endpoint.getConfiguration().isTransferExchange()) {
// we should transfer the entire exchange over the wire (includes in/out)
return DefaultExchangeHolder.marshal(exchange);
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
similarity index 93%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
index f470b0b..1584fa2 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -60,9 +60,9 @@ import org.slf4j.LoggerFactory;
/**
* A {@link org.apache.camel.Producer} implementation for MINA
*/
-public class Mina2Producer extends DefaultProducer {
+public class MinaProducer extends DefaultProducer {
- private static final Logger LOG = LoggerFactory.getLogger(Mina2Producer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinaProducer.class);
private final ResponseHandler handler;
private IoSession session;
private CountDownLatch responseLatch;
@@ -74,11 +74,11 @@ public class Mina2Producer extends DefaultProducer {
private IoConnector connector;
private boolean sync;
private CamelLogger noReplyLogger;
- private Mina2Configuration configuration;
+ private MinaConfiguration configuration;
private IoSessionConfig connectorConfig;
private ExecutorService workerPool;
- public Mina2Producer(Mina2Endpoint endpoint) throws Exception {
+ public MinaProducer(MinaEndpoint endpoint) throws Exception {
super(endpoint);
this.configuration = endpoint.getConfiguration();
this.lazySessionCreation = configuration.isLazySessionCreation();
@@ -100,8 +100,8 @@ public class Mina2Producer extends DefaultProducer {
}
@Override
- public Mina2Endpoint getEndpoint() {
- return (Mina2Endpoint) super.getEndpoint();
+ public MinaEndpoint getEndpoint() {
+ return (MinaEndpoint) super.getEndpoint();
}
@Override
@@ -134,7 +134,7 @@ public class Mina2Producer extends DefaultProducer {
exchange.setProperty(Exchange.CHARSET_NAME, IOHelper.normalizeCharset(getEndpoint().getConfiguration().getCharsetName()));
}
- Object body = Mina2PayloadHelper.getIn(getEndpoint(), exchange);
+ Object body = MinaPayloadHelper.getIn(getEndpoint(), exchange);
if (body == null) {
noReplyLogger.log("No payload to send for exchange: " + exchange);
return; // exit early since nothing to write
@@ -163,7 +163,7 @@ public class Mina2Producer extends DefaultProducer {
LOG.debug("Writing body: {}", out);
}
// write the body
- Mina2Helper.writeBody(session, body, exchange, writeTimeout);
+ MinaHelper.writeBody(session, body, exchange, writeTimeout);
if (sync) {
// wait for response, consider timeout
@@ -182,9 +182,9 @@ public class Mina2Producer extends DefaultProducer {
} else {
// set the result on either IN or OUT on the original exchange depending on its pattern
if (ExchangeHelper.isOutCapable(exchange)) {
- Mina2PayloadHelper.setOut(exchange, handler.getMessage());
+ MinaPayloadHelper.setOut(exchange, handler.getMessage());
} else {
- Mina2PayloadHelper.setIn(exchange, handler.getMessage());
+ MinaPayloadHelper.setIn(exchange, handler.getMessage());
}
}
}
@@ -198,9 +198,9 @@ public class Mina2Producer extends DefaultProducer {
// should session be closed after complete?
Boolean close;
if (ExchangeHelper.isOutCapable(exchange)) {
- close = exchange.getOut().getHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+ close = exchange.getOut().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
} else {
- close = exchange.getIn().getHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
+ close = exchange.getIn().getHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, Boolean.class);
}
// should we disconnect, the header can override the configuration
@@ -295,7 +295,7 @@ public class Mina2Producer extends DefaultProducer {
LOG.warn("Using vm protocol"
+ ", but an SSLContextParameters instance was provided. SSLContextParameters is only supported on the TCP protocol.");
}
- configureCodecFactory("Mina2Producer", connector);
+ configureCodecFactory("MinaProducer", connector);
}
protected void setupSocketProtocol(String uri) throws Exception {
@@ -326,7 +326,7 @@ public class Mina2Producer extends DefaultProducer {
filter.setUseClientMode(true);
connector.getFilterChain().addFirst("sslFilter", filter);
}
- configureCodecFactory("Mina2Producer", connector);
+ configureCodecFactory("MinaProducer", connector);
connector.setConnectTimeoutMillis(timeout);
}
@@ -342,7 +342,7 @@ public class Mina2Producer extends DefaultProducer {
if (configuration.isTextline()) {
Charset charset = getEncodingParameter(type, configuration);
LineDelimiter delimiter = getLineDelimiterParameter(configuration.getTextlineDelimiter());
- Mina2TextLineCodecFactory codecFactory = new Mina2TextLineCodecFactory(charset, delimiter);
+ MinaTextLineCodecFactory codecFactory = new MinaTextLineCodecFactory(charset, delimiter);
if (configuration.getEncoderMaxLineLength() > 0) {
codecFactory.setEncoderMaxLineLength(configuration.getEncoderMaxLineLength());
}
@@ -389,7 +389,7 @@ public class Mina2Producer extends DefaultProducer {
LOG.warn("Using datagram protocol, " + configuration.getProtocol()
+ ", but an SSLContextParameters instance was provided. SSLContextParameters is only supported on the TCP protocol.");
}
- configureDataGramCodecFactory("Mina2Producer", connector, configuration);
+ configureDataGramCodecFactory("MinaProducer", connector, configuration);
// set connect timeout to mina in seconds
connector.setConnectTimeoutMillis(timeout);
}
@@ -398,10 +398,10 @@ public class Mina2Producer extends DefaultProducer {
* For datagrams the entire message is available as a single IoBuffer so lets just pass those around by default
* and try converting whatever they payload is into IoBuffer unless some custom converter is specified
*/
- protected void configureDataGramCodecFactory(final String type, final IoService service, final Mina2Configuration configuration) {
+ protected void configureDataGramCodecFactory(final String type, final IoService service, final MinaConfiguration configuration) {
ProtocolCodecFactory codecFactory = configuration.getCodec();
if (codecFactory == null) {
- codecFactory = new Mina2UdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
+ codecFactory = new MinaUdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
if (LOG.isDebugEnabled()) {
LOG.debug("{}: Using CodecFactory: {}", type, codecFactory);
@@ -417,14 +417,14 @@ public class Mina2Producer extends DefaultProducer {
service.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory));
}
- private static LineDelimiter getLineDelimiterParameter(Mina2TextLineDelimiter delimiter) {
+ private static LineDelimiter getLineDelimiterParameter(MinaTextLineDelimiter delimiter) {
if (delimiter == null) {
return LineDelimiter.DEFAULT;
}
return delimiter.getLineDelimiter();
}
- private Charset getEncodingParameter(String type, Mina2Configuration configuration) {
+ private Charset getEncodingParameter(String type, MinaConfiguration configuration) {
String encoding = configuration.getEncoding();
if (encoding == null) {
encoding = Charset.defaultCharset().name();
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineCodecFactory.java
similarity index 90%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineCodecFactory.java
index 4ed3eaa..e10bbee 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineCodecFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.nio.charset.Charset;
@@ -29,14 +29,14 @@ 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.
+ * Uses Mina's default TextLineEncoder and TextLineDncoder.
*/
-public class Mina2TextLineCodecFactory implements ProtocolCodecFactory {
+public class MinaTextLineCodecFactory implements ProtocolCodecFactory {
private TextLineEncoder encoder;
private TextLineDecoder decoder;
- public Mina2TextLineCodecFactory(Charset charset, LineDelimiter delimiter) {
+ public MinaTextLineCodecFactory(Charset charset, LineDelimiter delimiter) {
if (delimiter.equals(LineDelimiter.AUTO)) {
// AUTO not supported by encoder
encoder = new TextLineEncoder(charset);
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineDelimiter.java
similarity index 90%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineDelimiter.java
index d0f35c8..e5aa9e8 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaTextLineDelimiter.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.mina.filter.codec.textline.LineDelimiter;
/**
* Possible text line delimiters to be used with the textline codec.
*/
-public enum Mina2TextLineDelimiter {
+public enum MinaTextLineDelimiter {
DEFAULT(LineDelimiter.DEFAULT),
AUTO(LineDelimiter.AUTO),
@@ -31,7 +31,7 @@ public enum Mina2TextLineDelimiter {
private final LineDelimiter lineDelimiter;
- Mina2TextLineDelimiter(LineDelimiter lineDelimiter) {
+ MinaTextLineDelimiter(LineDelimiter lineDelimiter) {
this.lineDelimiter = lineDelimiter;
}
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaUdpProtocolCodecFactory.java
similarity index 94%
rename from components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaUdpProtocolCodecFactory.java
index 6da997c..75e586f 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaUdpProtocolCodecFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.nio.charset.CharacterCodingException;
@@ -28,11 +28,11 @@ import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-public class Mina2UdpProtocolCodecFactory implements ProtocolCodecFactory {
+public class MinaUdpProtocolCodecFactory implements ProtocolCodecFactory {
private final CamelContext context;
- public Mina2UdpProtocolCodecFactory(CamelContext context) {
+ public MinaUdpProtocolCodecFactory(CamelContext context) {
this.context = context;
}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
index 54eaf00..e03845b 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.BindToRegistry;
import org.apache.camel.support.jsse.ClientAuthentication;
@@ -27,7 +27,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.BeforeClass;
-public class BaseMina2Test extends CamelTestSupport {
+public class BaseMinaTest extends CamelTestSupport {
protected static final String KEY_STORE_PASSWORD = "changeit";
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
similarity index 86%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
index 129d4bc..249f904 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.SocketAddress;
@@ -28,7 +28,7 @@ import org.junit.Test;
* Unit test to check if the message of an exchange send from the MinaConsumer
* is a MinaMessage.
*/
-public class MessageIOSessionTest extends BaseMina2Test {
+public class MessageIOSessionTest extends BaseMinaTest {
@Test
public void testIoSession() throws Exception {
@@ -39,7 +39,7 @@ public class MessageIOSessionTest extends BaseMina2Test {
Exchange exchange = mock.getExchanges().get(0);
Message message = exchange.getIn();
- assertNotNull(message.getHeader(Mina2Constants.MINA_IOSESSION));
+ assertNotNull(message.getHeader(MinaConstants.MINA_IOSESSION));
}
@@ -51,10 +51,10 @@ public class MessageIOSessionTest extends BaseMina2Test {
assertMockEndpointsSatisfied();
Message message = mock.getExchanges().get(0).getIn();
- // Not making assumptions on what these headers contain, because it might differ
+ // Not making assumptions on what these headers contain, because it might differ
// on different machines/OSs.
- assertNotNull(message.getHeader(Mina2Constants.MINA_LOCAL_ADDRESS, SocketAddress.class));
- assertNotNull(message.getHeader(Mina2Constants.MINA_REMOTE_ADDRESS, SocketAddress.class));
+ assertNotNull(message.getHeader(MinaConstants.MINA_LOCAL_ADDRESS, SocketAddress.class));
+ assertNotNull(message.getHeader(MinaConstants.MINA_REMOTE_ADDRESS, SocketAddress.class));
}
@Override
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java
similarity index 92%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java
index edeaa47..92eb0f2 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
@@ -31,7 +31,7 @@ import org.junit.Ignore;
import org.junit.Test;
@Ignore("fix me")
-public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test {
+public class MinaClientModeTcpTextlineDelimiterTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -61,7 +61,7 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test {
}
};
}
-
+
private class Server {
private final int port;
private IoAcceptor acceptor;
@@ -69,21 +69,21 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test {
Server(int port) {
this.port = port;
}
-
+
public void startup() throws Exception {
acceptor = new NioSocketAcceptor();
- Mina2TextLineCodecFactory codecFactory = new Mina2TextLineCodecFactory(Charset.forName("UTF-8"), LineDelimiter.UNIX);
+ MinaTextLineCodecFactory codecFactory = new MinaTextLineCodecFactory(Charset.forName("UTF-8"), LineDelimiter.UNIX);
acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(codecFactory));
acceptor.setHandler(new ServerHandler());
acceptor.bind(new InetSocketAddress("127.0.0.1", port));
}
-
+
public void shutdown() throws Exception {
acceptor.unbind();
acceptor.dispose();
}
}
-
+
private class ServerHandler extends IoHandlerAdapter {
@Override
public void sessionOpened(IoSession session) throws Exception {
@@ -91,4 +91,4 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test {
session.closeNow();
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java
index a464bd6..d3400c0 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Mina2ClientServerTest extends BaseMina2Test {
+public class MinaClientServerTest extends BaseMinaTest {
@Test
public void testSendToServer() throws InterruptedException {
@@ -58,4 +58,4 @@ public class Mina2ClientServerTest extends BaseMina2Test {
}
}
// END SNIPPET: e2
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
index 384524a..0290e0d 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -23,7 +23,7 @@ import org.junit.Test;
/**
* For testing various minor holes that hasn't been covered by other unit tests.
*/
-public class Mina2ComponentTest extends CamelTestSupport {
+public class MinaComponentTest extends CamelTestSupport {
@Test
public void testUnknownProtocol() {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java
similarity index 77%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java
index cf650e8..8190c3a 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java
@@ -14,29 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class Mina2ComponentWithConfigurationTest extends CamelTestSupport {
+public class MinaComponentWithConfigurationTest extends CamelTestSupport {
@Test
public void testMinaComponentWithConfiguration() throws Exception {
- Mina2Component comp = context.getComponent("mina", Mina2Component.class);
+ MinaComponent comp = context.getComponent("mina", MinaComponent.class);
- Mina2Configuration cfg1 = new Mina2Configuration();
+ MinaConfiguration cfg1 = new MinaConfiguration();
cfg1.setHost("abc");
cfg1.setPort(4455);
cfg1.setProtocol("tcp");
- Mina2Configuration cfg2 = new Mina2Configuration();
+ MinaConfiguration cfg2 = new MinaConfiguration();
cfg2.setHost("abc");
cfg2.setPort(4455);
cfg2.setProtocol("udp");
- Mina2Endpoint e1 = (Mina2Endpoint) comp.createEndpoint(cfg1);
- Mina2Endpoint e2 = (Mina2Endpoint) comp.createEndpoint(cfg2);
+ MinaEndpoint e1 = (MinaEndpoint) comp.createEndpoint(cfg1);
+ MinaEndpoint e2 = (MinaEndpoint) comp.createEndpoint(cfg2);
// should not be same
assertNotSame(e1, e2);
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
index 4e1c299..8c51609 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -25,7 +25,7 @@ import org.junit.Test;
/**
* Unit test for wiki documentation
*/
-public class Mina2ConsumerTest extends BaseMina2Test {
+public class MinaConsumerTest extends BaseMinaTest {
int port1;
int port2;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java
similarity index 85%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java
index 7f0fe11..97fde40 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -26,14 +26,14 @@ import org.apache.mina.core.buffer.IoBuffer;
import org.junit.Assert;
import org.junit.Test;
-public class Mina2ConverterTest extends Assert {
+public class MinaConverterTest extends Assert {
@Test
public void testToByteArray() {
byte[] in = "Hello World".getBytes();
IoBuffer bb = IoBuffer.wrap(in);
- byte[] out = Mina2Converter.toByteArray(bb);
+ byte[] out = MinaConverter.toByteArray(bb);
for (int i = 0; i < out.length; i++) {
assertEquals(in[i], out[i]);
@@ -47,7 +47,7 @@ public class Mina2ConverterTest extends Assert {
Exchange exchange = new DefaultExchange(new DefaultCamelContext());
exchange.setProperty(Exchange.CHARSET_NAME, "UTF-8");
- String out = Mina2Converter.toString(bb, exchange);
+ String out = MinaConverter.toString(bb, exchange);
assertEquals("Hello World \u4f60\u597d", out);
}
@@ -58,11 +58,11 @@ public class Mina2ConverterTest extends Assert {
Exchange exchange = new DefaultExchange(new DefaultCamelContext());
exchange.setProperty(Exchange.CHARSET_NAME, "UTF-8");
- String out = Mina2Converter.toString(bb, exchange);
+ String out = MinaConverter.toString(bb, exchange);
assertEquals("Hello World \u4f60\u597d", out);
// should NOT be possible to convert to string without affecting the ByteBuffer
- out = Mina2Converter.toString(bb, exchange);
+ out = MinaConverter.toString(bb, exchange);
assertEquals("", out);
}
@@ -71,7 +71,7 @@ public class Mina2ConverterTest extends Assert {
byte[] in = "Hello World".getBytes();
IoBuffer bb = IoBuffer.wrap(in);
- InputStream is = Mina2Converter.toInputStream(bb);
+ InputStream is = MinaConverter.toInputStream(bb);
for (byte b : in) {
int out = is.read();
assertEquals(b, out);
@@ -82,12 +82,12 @@ public class Mina2ConverterTest extends Assert {
public void testToByteBuffer() {
byte[] in = "Hello World".getBytes();
- IoBuffer bb = Mina2Converter.toIoBuffer(in);
+ IoBuffer bb = MinaConverter.toIoBuffer(in);
assertNotNull(bb);
// convert back to byte[] and see if the bytes are equal
bb.flip(); // must flip to change direction to read
- byte[] out = Mina2Converter.toByteArray(bb);
+ byte[] out = MinaConverter.toByteArray(bb);
for (int i = 0; i < out.length; i++) {
assertEquals(in[i], out[i]);
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
similarity index 98%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
index c93d070..d6d9b98 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
@@ -34,7 +34,7 @@ import org.junit.Test;
/**
* Unit test with custom codec.
*/
-public class Mina2CustomCodecTest extends BaseMina2Test {
+public class MinaCustomCodecTest extends BaseMinaTest {
@BindToRegistry("myCodec")
private MyCodec codec1 = new MyCodec();
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java
similarity index 92%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java
index 12b2695..844916f 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.lang.reflect.Field;
@@ -26,7 +26,7 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.mina.core.session.IoSession;
import org.junit.Test;
-public class Mina2DisconnectRaceConditionTest extends BaseMina2Test {
+public class MinaDisconnectRaceConditionTest extends BaseMinaTest {
/**
* This is a test for issue CAMEL-10024 - the closing must complete before we return from the producer
@@ -36,7 +36,7 @@ public class Mina2DisconnectRaceConditionTest extends BaseMina2Test {
@Test
public void testCloseSessionWhenCompleteManyTimes() throws Exception {
final String endpointUri = String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true&minaLogger=true", getPort());
- Mina2Producer producer = (Mina2Producer) context.getEndpoint(endpointUri).createProducer();
+ MinaProducer producer = (MinaProducer) context.getEndpoint(endpointUri).createProducer();
// Access session to check that the session is really closed
Field field = producer.getClass().getDeclaredField("session");
field.setAccessible(true);
@@ -67,4 +67,4 @@ public class Mina2DisconnectRaceConditionTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java
index 6cf1321..3da2163 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* Unit test for close session when complete test.
*/
-public class Mina2DisconnectTest extends BaseMina2Test {
+public class MinaDisconnectTest extends BaseMinaTest {
@Test
public void testCloseSessionWhenComplete() throws Exception {
@@ -47,4 +47,4 @@ public class Mina2DisconnectTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
index 9618c56..523d46a 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
@@ -28,7 +27,7 @@ import org.junit.Test;
/**
* Unit testing using different encodings with the TCP protocol.
*/
-public class Mina2EncodingTest extends BaseMina2Test {
+public class MinaEncodingTest extends BaseMinaTest {
@Test
public void testTCPEncodeUTF8InputIsBytes() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java
index d396d0d..5380f50 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -25,7 +25,7 @@ import org.junit.Test;
/**
* To test timeout.
*/
-public class Mina2ExchangeDefaultTimeOutTest extends BaseMina2Test {
+public class MinaExchangeDefaultTimeOutTest extends BaseMinaTest {
@Test
public void testDefaultTimeOut() {
@@ -56,4 +56,4 @@ public class Mina2ExchangeDefaultTimeOutTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java
index d5b7fc6..99552d8 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* To test timeout.
*/
-public class Mina2ExchangeTimeOutTest extends BaseMina2Test {
+public class MinaExchangeTimeOutTest extends BaseMinaTest {
@Test
public void testUsingTimeoutParameter() throws Exception {
@@ -58,7 +58,7 @@ public class Mina2ExchangeTimeOutTest extends BaseMina2Test {
// MinaProducer has a default timeout of 3 seconds so we just wait 2 seconds
// (template.requestBody is a MinaProducer behind the doors)
Thread.sleep(2000);
-
+
e.getOut().setBody("Okay I will be faster in the future");
}
});
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
index fa33bb6..2d4d2d8 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2FileTcpTest extends BaseMina2Test {
+public class MinaFileTcpTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -44,4 +44,4 @@ public class Mina2FileTcpTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java
index e9d5db9..8c9b1fe 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2FileUdpTest extends BaseMina2Test {
+public class MinaFileUdpTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -44,4 +44,4 @@ public class Mina2FileUdpTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
index db23eca..db96faf 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +34,7 @@ import org.junit.Test;
/**
* For unit testing the <tt>filters</tt> option.
*/
-public class Mina2FiltersTest extends BaseMina2Test {
+public class MinaFiltersTest extends BaseMinaTest {
@Test
public void testFilterListRef() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java
index e760963..6da29d5 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -26,7 +26,7 @@ import org.junit.Test;
* Unit test to verify that MINA can be used with an InOnly MEP but still use sync to send and receive data
* from a remote server.
*/
-public class Mina2InOnlyRouteTest extends BaseMina2Test {
+public class MinaInOnlyRouteTest extends BaseMinaTest {
@Test
public void testInOnlyUsingMina() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java
similarity index 89%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java
index 19636b7..45aaa60 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* Unit test for close session when complete test.
*/
-public class Mina2InOutCloseSessionWhenCompleteTest extends BaseMina2Test {
+public class MinaInOutCloseSessionWhenCompleteTest extends BaseMinaTest {
@Test
public void testCloseSessionWhenComplete() throws Exception {
@@ -42,10 +42,10 @@ public class Mina2InOutCloseSessionWhenCompleteTest extends BaseMina2Test {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
- exchange.getOut().setHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
+ exchange.getOut().setHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
}
});
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
index 3510dc2..482de82 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -26,7 +26,7 @@ import org.junit.Test;
* 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.
*/
-public class Mina2InOutRouteTest extends BaseMina2Test {
+public class MinaInOutRouteTest extends BaseMinaTest {
@Test
public void testInOutUsingMina() throws Exception {
@@ -59,4 +59,4 @@ public class Mina2InOutRouteTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
index aa7f0b0..6be017b 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -26,7 +26,7 @@ import org.junit.Test;
* 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 and using MAC textline delimiter.
*/
-public class Mina2InOutRouteTextLineDelimiterTest extends BaseMina2Test {
+public class MinaInOutRouteTextLineDelimiterTest extends BaseMinaTest {
@Test
public void testInOutUsingMina() throws Exception {
@@ -56,4 +56,4 @@ public class Mina2InOutRouteTextLineDelimiterTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
index 3c14d1b..922ef10 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.RuntimeCamelException;
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* Unit test with InOut however we want sometimes to not send a response.
*/
-public class Mina2InOutWithForcedNoResponseTest extends BaseMina2Test {
+public class MinaInOutWithForcedNoResponseTest extends BaseMinaTest {
int port1;
int port2;
@@ -70,4 +70,4 @@ public class Mina2InOutWithForcedNoResponseTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java
index c795a17..879e673 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Mina2MaxLineLengthTest extends BaseMina2Test {
+public class MinaMaxLineLengthTest extends BaseMinaTest {
@Test
public void testSendToServer() {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
similarity index 85%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
index 5107b7e..87a7cf9 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.List;
@@ -25,7 +25,7 @@ import org.junit.Test;
/**
* For unit testing the <tt>noDefaultCodec</tt> option.
*/
-public class Mina2NoDefaultCodecTest extends BaseMina2Test {
+public class MinaNoDefaultCodecTest extends BaseMinaTest {
int port1;
int port2;
@@ -46,8 +46,8 @@ public class Mina2NoDefaultCodecTest extends BaseMina2Test {
}
});
- Mina2Producer producer1 = (Mina2Producer) context.getEndpoint(uri1).createProducer();
- Mina2Producer producer2 = (Mina2Producer) context.getEndpoint(uri2).createProducer();
+ MinaProducer producer1 = (MinaProducer) context.getEndpoint(uri1).createProducer();
+ MinaProducer producer2 = (MinaProducer) context.getEndpoint(uri2).createProducer();
List<Entry> filters1 = producer1.getFilterChain().getAll();
List<Entry> filters2 = producer2.getFilterChain().getAll();
assertTrue(filters1.size() < filters2.size());
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
index 588bf84..f3b3a57 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExchangeException;
@@ -34,7 +34,7 @@ import org.junit.Test;
* Unit test to test what happens if remote server closes session but doesn't
* reply
*/
-public class Mina2NoResponseFromServerTest extends BaseMina2Test {
+public class MinaNoResponseFromServerTest extends BaseMinaTest {
@BindToRegistry("myCodec")
private MyCodec codec1 = new MyCodec();
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
index 086fe0a..c361407 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +30,7 @@ import org.junit.Ignore;
import org.junit.Test;
@Ignore("TODO: investigate for Camel 3.0")
-public class Mina2ProducerAnotherConcurrentTest extends BaseMina2Test {
+public class MinaProducerAnotherConcurrentTest extends BaseMinaTest {
@Test
public void testSimple() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
index fda6a77..137d82d 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,7 +30,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Mina2ProducerConcurrentTest extends BaseMina2Test {
+public class MinaProducerConcurrentTest extends BaseMinaTest {
@Test
public void testNoConcurrentProducers() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java
similarity index 96%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java
index dda503b..1a92d6c 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.lang.reflect.Field;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify;
/**
* Unit testing for using a MinaProducer that it can shutdown properly (CAMEL-395)
*/
-public class Mina2ProducerShutdownMockTest extends BaseMina2Test {
+public class MinaProducerShutdownMockTest extends BaseMinaTest {
@Test
public void testProducerShutdownTestingWithMock() throws Exception {
@@ -79,4 +79,4 @@ public class Mina2ProducerShutdownMockTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java
index d98de15..d8876e0 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -32,14 +32,14 @@ import org.junit.Test;
* Run this test from maven: mvn exec:java and see the output if there is a error.
*/
@Ignore
-public class Mina2ProducerShutdownTest extends TestSupport {
+public class MinaProducerShutdownTest extends TestSupport {
private static final String URI = "mina:tcp://localhost:6321?textline=true&sync=false";
private long start;
private CamelContext context;
public static void main(String[] args) throws Exception {
- Mina2ProducerShutdownTest me = new Mina2ProducerShutdownTest();
+ MinaProducerShutdownTest me = new MinaProducerShutdownTest();
me.testProducer();
}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java
index 56da0e4..7fc6dbc 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.test.junit4.TestSupport;
import org.apache.mina.core.service.IoHandler;
@@ -25,7 +25,7 @@ import org.apache.mina.core.session.IoSession;
* {@link IoHandler} implementation of reverser server protocol.
*
*/
-public class Mina2ReverseProtocolHandler extends IoHandlerAdapter {
+public class MinaReverseProtocolHandler extends IoHandlerAdapter {
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverserServer.java
similarity index 91%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverserServer.java
index c94bb99..12e436d 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverserServer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
@@ -28,12 +28,12 @@ import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
* (<b>Entry point</b>) Reverser server which reverses all text lines from
* clients.
*/
-public class Mina2ReverserServer {
+public class MinaReverserServer {
protected final int port;
private IoAcceptor acceptor;
- public Mina2ReverserServer(int port) {
+ public MinaReverserServer(int port) {
this.port = port;
}
@@ -44,7 +44,7 @@ public class Mina2ReverserServer {
((NioSocketAcceptor) acceptor).setReuseAddress(true);
Charset charset = Charset.forName("UTF-8");
acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new TextLineCodecFactory(charset)));
- acceptor.setHandler(new Mina2ReverseProtocolHandler());
+ acceptor.setHandler(new MinaReverseProtocolHandler());
// Bind
acceptor.bind(new InetSocketAddress(port));
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java
index 18331ac..c834d1e 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Mina2SendToProcessorTest extends BaseMina2Test {
+public class MinaSendToProcessorTest extends BaseMinaTest {
@Test
public void testConnectionOnStartupTest() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java
similarity index 86%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java
index bae8062..e2df929 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,7 +25,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* Unit test spring based mina endpoint configuration.
*/
-public class Mina2SpringMinaEndpointTest extends CamelSpringTestSupport {
+public class MinaSpringMinaEndpointTest extends CamelSpringTestSupport {
@Test
public void testMinaSpringEndpoint() throws Exception {
@@ -36,13 +36,13 @@ public class Mina2SpringMinaEndpointTest extends CamelSpringTestSupport {
assertMockEndpointsSatisfied();
// checking the endpoint uri
- Mina2Endpoint endpoint = applicationContext.getBean("myMinaEndpoint", Mina2Endpoint.class);
+ MinaEndpoint endpoint = applicationContext.getBean("myMinaEndpoint", MinaEndpoint.class);
Integer port = applicationContext.getBean("port", Integer.class);
assertEquals("mina:tcp:localhost:" + port, endpoint.getEndpointUri());
}
@Override
protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml");
}
}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java
similarity index 89%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java
index 4673b50..afb6156 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -24,7 +24,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* Unit test spring based mina endpoint configuration.
*/
-public class Mina2SpringMinaEndpointUDPTest extends CamelSpringTestSupport {
+public class MinaSpringMinaEndpointUDPTest extends CamelSpringTestSupport {
@Test
public void testMinaSpringEndpoint() throws Exception {
@@ -38,6 +38,6 @@ public class Mina2SpringMinaEndpointUDPTest extends CamelSpringTestSupport {
@Override
protected ClassPathXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/mina/SpringMinaEndpointUDPTest-context.xml");
}
}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
similarity index 89%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
index c690990..ac47219 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -25,12 +25,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
*
*/
-public class Mina2SpringMultipleUDPTest extends CamelSpringTestSupport {
+public class MinaSpringMultipleUDPTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
- "org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml");
+ "org/apache/camel/component/mina/SpringMultipleUDPTest-context.xml");
}
@Test
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java
index e16b121..41a4aac 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2SslContextParametersTcpTest extends BaseMina2Test {
+public class MinaSslContextParametersTcpTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -32,7 +32,7 @@ public class Mina2SslContextParametersTcpTest extends BaseMina2Test {
assertMockEndpointsSatisfied();
}
-
+
@Override
protected boolean isUseSslContext() {
return true;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java
similarity index 93%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java
index ae45b9f..1ec7bb5 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@@ -24,11 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2SslContextParametersUdpTest extends BaseMina2Test {
+public class MinaSslContextParametersUdpTest extends BaseMinaTest {
protected int messageCount = 3;
- public Mina2SslContextParametersUdpTest() {
+ public MinaSslContextParametersUdpTest() {
}
@Test
@@ -57,7 +57,7 @@ public class Mina2SslContextParametersUdpTest extends BaseMina2Test {
socket.close();
}
}
-
+
@Override
protected boolean isUseSslContext() {
return true;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java
index 8720588..e575cc1 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2SslContextParametersVmTest extends BaseMina2Test {
+public class MinaSslContextParametersVmTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -32,7 +32,7 @@ public class Mina2SslContextParametersVmTest extends BaseMina2Test {
assertMockEndpointsSatisfied();
}
-
+
@Override
protected boolean isUseSslContext() {
return true;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java
index 80188de..778175c 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.CamelContext;
import org.apache.camel.SSLContextParametersAware;
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
+public class MinaSslGlobalContextParametersTcpTest extends BaseMinaTest {
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -42,7 +42,7 @@ public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
assertMockEndpointsSatisfied();
}
-
+
@Override
protected boolean isUseSslContext() {
return true;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
index 02bb649..8f54acc 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.io.InputStream;
@@ -29,9 +29,9 @@ import org.apache.camel.util.IOHelper;
import org.junit.Test;
/**
- * To test camel-mina2 component using a TCP client that communicates using TCP socket communication.
+ * To test camel-mina component using a TCP client that communicates using TCP socket communication.
*/
-public class Mina2TcpLineDelimiterUsingPlainSocketTest extends BaseMina2Test {
+public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest {
@Test
public void testSendAndReceiveOnce() throws Exception {
@@ -85,7 +85,7 @@ public class Mina2TcpLineDelimiterUsingPlainSocketTest extends BaseMina2Test {
InputStream is = null;
try {
os = soc.getOutputStream();
- // must append MAC newline at the end to flag end of textline to camel-mina2
+ // must append MAC newline at the end to flag end of textline to camel-mina
os.write((input + "\r").getBytes());
is = soc.getInputStream();
@@ -141,4 +141,4 @@ public class Mina2TcpLineDelimiterUsingPlainSocketTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java
index f499894..d30ed5f 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2TcpTest extends BaseMina2Test {
+public class MinaTcpTest extends BaseMinaTest {
@Test
public void testMinaRoute1() throws Exception {
@@ -32,7 +32,7 @@ public class Mina2TcpTest extends BaseMina2Test {
assertMockEndpointsSatisfied();
}
-
+
@Test
public void testMinaRoute2() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
index 49c7cb0..10d12dc 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2TcpTextlineDelimiterTest extends BaseMina2Test {
+public class MinaTcpTextlineDelimiterTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -45,4 +45,4 @@ public class Mina2TcpTextlineDelimiterTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java
index 3ed00dc..80c094a 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2TcpTextlineProtocolTest extends BaseMina2Test {
+public class MinaTcpTextlineProtocolTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java
index 4ddae5d..08123c8 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -28,7 +28,7 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Mina2TcpWithInOutTest extends BaseMina2Test {
+public class MinaTcpWithInOutTest extends BaseMinaTest {
private String uri;
private Exchange receivedExchange;
@@ -39,7 +39,7 @@ public class Mina2TcpWithInOutTest extends BaseMina2Test {
latch = new CountDownLatch(1);
uri = String.format("mina:tcp://localhost:%1$s?textline=true", getPort());
- Mina2ReverserServer server = new Mina2ReverserServer(getPort());
+ MinaReverserServer server = new MinaReverserServer(getPort());
server.start();
context.addRoutes(new RouteBuilder() {
@@ -84,7 +84,7 @@ public class Mina2TcpWithInOutTest extends BaseMina2Test {
uri = String.format("mina:tcp://localhost:%1$s?textline=true&lazySessionCreation=true", getPort());
// The server is activated after Camel to check if the lazyness is working
- Mina2ReverserServer server = new Mina2ReverserServer(getPort());
+ MinaReverserServer server = new MinaReverserServer(getPort());
server.start();
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
index 667b6f3..d641db0 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.io.InputStream;
@@ -29,9 +29,9 @@ import org.apache.camel.util.IOHelper;
import org.junit.Test;
/**
- * To test camel-mina2 component using a TCP client that communicates using TCP socket communication.
+ * To test camel-mina component using a TCP client that communicates using TCP socket communication.
*/
-public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
+public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest {
@Test
public void testSendAndReceiveOnce() throws Exception {
@@ -73,7 +73,7 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
assertTrue("out should not be the same as in when the exchange has failed", !"force-exception".equals(out));
assertEquals("should get the exception here", out, "java.lang.IllegalArgumentException: Forced exception");
}
-
+
@Test
public void testExchangeWithInOnly() throws IOException {
String out = sendAndReceive("force-set-in-body");
@@ -83,7 +83,7 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
private String sendAndReceive(String input) throws IOException {
return sendAndReceive(input, getPort());
}
-
+
private String sendAndReceive(String input, int port) throws IOException {
byte buf[] = new byte[128];
@@ -95,7 +95,7 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
InputStream is = null;
try {
os = soc.getOutputStream();
- // must append newline at the end to flag end of textline to camel-mina2
+ // must append newline at the end to flag end of textline to camel-mina
os.write((input + LS).getBytes());
is = soc.getInputStream();
@@ -145,7 +145,7 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
e.getIn().setBody("Update the in message!");
} else {
e.getOut().setBody("Hello " + in);
- }
+ }
}
});
}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java
index 764a8dc..b5a9561 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* To unit test CAMEL-364.
*/
-public class Mina2TcpWithIoOutProcessorExceptionTest extends BaseMina2Test {
+public class MinaTcpWithIoOutProcessorExceptionTest extends BaseMinaTest {
@Test
public void testExceptionThrownInProcessor() {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
index 019bbe2..5464d81 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.nio.charset.Charset;
@@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory;
/**
* Unit test for the <tt>transferExchange=true</tt> option.
*/
-public class Mina2TransferExchangeOptionTest extends BaseMina2Test {
+public class MinaTransferExchangeOptionTest extends BaseMinaTest {
- private static final Logger LOG = LoggerFactory.getLogger(Mina2TransferExchangeOptionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinaTransferExchangeOptionTest.class);
@Test
public void testMinaTransferExchangeOptionWithoutException() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java
index 3bd8130..0caa0db 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@@ -24,11 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2UdpConcurrentTest extends BaseMina2Test {
+public class MinaUdpConcurrentTest extends BaseMinaTest {
protected int messageCount = 3;
- public Mina2UdpConcurrentTest() {
+ public MinaUdpConcurrentTest() {
}
@Test
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java
similarity index 95%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java
index 3028f7c..9291322 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -42,12 +42,12 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
-public class Mina2UdpNoCamelTest {
+public class MinaUdpNoCamelTest {
- private static Logger logger = LoggerFactory.getLogger(Mina2UdpNoCamelTest.class);
+ private static Logger logger = LoggerFactory.getLogger(MinaUdpNoCamelTest.class);
Charset charset = Charset.defaultCharset();
LineDelimiter delimiter = LineDelimiter.DEFAULT;
- Mina2TextLineCodecFactory codecFactory = new Mina2TextLineCodecFactory(charset, delimiter);
+ MinaTextLineCodecFactory codecFactory = new MinaTextLineCodecFactory(charset, delimiter);
UDPServer server;
private int port = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
index 95dab06..71e51c3 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@@ -24,11 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2UdpTest extends BaseMina2Test {
+public class MinaUdpTest extends BaseMinaTest {
protected int messageCount = 3;
- public Mina2UdpTest() {
+ public MinaUdpTest() {
}
@Test
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
index 03116b7..e92eaac 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.util.List;
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2UdpUsingTemplateTest extends BaseMina2Test {
+public class MinaUdpUsingTemplateTest extends BaseMinaTest {
private int messageCount = 3;
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java
index 3e90b1d..e437a51 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@@ -30,9 +30,9 @@ import org.slf4j.LoggerFactory;
/**
* To test InOut exchange for the UDP protocol.
*/
-public class Mina2UdpWithInOutUsingPlainSocketTest extends BaseMina2Test {
+public class MinaUdpWithInOutUsingPlainSocketTest extends BaseMinaTest {
- private static final Logger LOG = LoggerFactory.getLogger(Mina2UdpWithInOutUsingPlainSocketTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinaUdpWithInOutUsingPlainSocketTest.class);
@Test
public void testSendAndReceiveOnce() throws Exception {
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
index 96d32fb..568c777 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.BindToRegistry;
import org.apache.camel.ResolveEndpointFailedException;
@@ -33,7 +33,7 @@ import org.junit.Test;
/**
* Unit test with custom codec using the VM protocol.
*/
-public class Mina2VMCustomCodecTest extends BaseMina2Test {
+public class MinaVMCustomCodecTest extends BaseMinaTest {
@BindToRegistry("myCodec")
private MyCodec codec1 = new MyCodec();
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
index d60428c..1931fe9 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2VMFileTcpTest extends BaseMina2Test {
+public class MinaVMFileTcpTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -44,4 +44,4 @@ public class Mina2VMFileTcpTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
index 5ba7d47..f42feef 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
+public class MinaVMTextlineProtocolTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -44,4 +44,4 @@ public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
similarity index 97%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
index a339204..1878c1b 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import java.nio.charset.Charset;
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
* Unit test for the <tt>transferExchange=true</tt> option.
*/
-public class Mina2VMTransferExchangeOptionTest extends BaseMina2Test {
+public class MinaVMTransferExchangeOptionTest extends BaseMinaTest {
@Test
public void testMinaTransferExchangeOptionWithoutException() throws Exception {
@@ -117,4 +117,4 @@ public class Mina2VMTransferExchangeOptionTest extends BaseMina2Test {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
similarity index 94%
rename from components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
index 129a7cd..a1ac148 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2;
+package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2VmTest extends BaseMina2Test {
+public class MinaVmTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
diff --git a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml
similarity index 98%
rename from components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml
index 6209349..c4f6c21 100644
--- a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml
+++ b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointTest-context.xml
@@ -28,7 +28,7 @@
<!-- START SNIPPET: e1 -->
<!-- Creating mina endpoints is a bit complex so we reuse MinaComponnet
as a factory bean to create our endpoint, this is the easiest to do -->
- <bean id="myMinaFactory" class="org.apache.camel.component.mina2.Mina2Component">
+ <bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
</bean>
@@ -44,7 +44,7 @@
</bean>
<!-- this is our mina configuration with plain properties -->
- <bean id="myMinaConfig" class="org.apache.camel.component.mina2.Mina2Configuration">
+ <bean id="myMinaConfig" class="org.apache.camel.component.mina.MinaConfiguration">
<property name="protocol" value="tcp"/>
<property name="host" value="localhost"/>
<property name="port" ref="port"/>
diff --git a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointUDPTest-context.xml
similarity index 98%
rename from components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointUDPTest-context.xml
index 555c523..f26d708 100644
--- a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml
+++ b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMinaEndpointUDPTest-context.xml
@@ -26,7 +26,7 @@
<!-- START SNIPPET: e1 -->
<!-- Creating mina endpoints is a bit complex so we reuse MinaComponnet
as a factory bean to create our endpoint, this is the easiest to do -->
- <bean id="myMinaFactory" class="org.apache.camel.component.mina2.Mina2Component">
+ <bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
</bean>
@@ -42,7 +42,7 @@
</bean>
<!-- this is our mina configuration with plain properties -->
- <bean id="myMinaConfig" class="org.apache.camel.component.mina2.Mina2Configuration">
+ <bean id="myMinaConfig" class="org.apache.camel.component.mina.MinaConfiguration">
<property name="protocol" value="udp"/>
<property name="host" value="localhost"/>
<property name="port" value="1234"/>
diff --git a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMultipleUDPTest-context.xml
similarity index 98%
rename from components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMultipleUDPTest-context.xml
index 25b6156..82a47bc 100644
--- a/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml
+++ b/components/camel-mina/src/test/resources/org/apache/camel/component/mina/SpringMultipleUDPTest-context.xml
@@ -26,7 +26,7 @@
<!-- START SNIPPET: e1 -->
<!-- Creating mina endpoints is a bit complex so we reuse MinaComponnet
as a factory bean to create our endpoint, this is the easiest to do -->
- <bean id="myMinaFactory" class="org.apache.camel.component.mina2.Mina2Component">
+ <bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
</bean>
@@ -42,7 +42,7 @@
</bean>
<!-- this is our mina configuration with plain properties -->
- <bean id="myMinaConfig" class="org.apache.camel.component.mina2.Mina2Configuration">
+ <bean id="myMinaConfig" class="org.apache.camel.component.mina.MinaConfiguration">
<property name="protocol" value="udp"/>
<property name="host" value="localhost"/>
<property name="port" value="1234"/>
diff --git a/components/camel-mllp/README.md b/components/camel-mllp/README.md
index e398040..9983e63 100644
--- a/components/camel-mllp/README.md
+++ b/components/camel-mllp/README.md
@@ -52,7 +52,7 @@ eliminates the dependencies on other camel components.
While Camel already includes some of this functionality in the camel-hl7 component, the implementation does not
provide all of the functionality required to effectively handle the MLLP protocol - especially under adverse conditions.
-The camel-hl7 Mina2 codec and Netty decoder do not handle MLLP Framing errors very well - the component will hang waiting
+The camel-hl7 Mina codec and Netty decoder do not handle MLLP Framing errors very well - the component will hang waiting
for frames to complete in some instances.
While both camel-mina and camel-netty provide a "timeout" function, it is only applied to Producers. MLLP Consumers
@@ -60,7 +60,7 @@ also need to be able to timeout to recover from MLLP framing errors. Additional
camel-netty component is disable after any data is received on the connection, making in ineffective for detecting
timeouts after the first messages is received.
-Also, neither the Mina2 codec nor the Netty decoder interrogate HL7 Acknowledgments. Therefore, it is much more
+Also, neither the Mina codec nor the Netty decoder interrogate HL7 Acknowledgments. Therefore, it is much more
difficult to use the redelivery and error handling features Camel provides.
The above issues may be addressable by updating/patching the existing components, but there is one more that is not.
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 6c50c59..45f74aa 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina2-version}</version>
+ <version>${mina-version}</version>
<scope>test</scope>
</dependency>
<dependency>
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 3f24964..27bd9e5 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
@@ -27,7 +27,7 @@
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
</bean>
- <bean id="myMinaFactory" class="org.apache.camel.component.mina2.Mina2Component">
+ <bean id="myMinaFactory" class="org.apache.camel.component.mina.MinaComponent">
<!-- we must provide a camel context so we refer to it by its id -->
<constructor-arg index="0" ref="myCamel"/>
</bean>
@@ -40,7 +40,7 @@
</bean>
<!-- this is our mina configuration with plain properties -->
- <bean id="minaSyslogConfig" class="org.apache.camel.component.mina2.Mina2Configuration">
+ <bean id="minaSyslogConfig" class="org.apache.camel.component.mina.MinaConfiguration">
<property name="protocol" value="udp"/>
<property name="host" value="localhost"/>
<property name="port" value="${server-port}"/>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 9f6f420..7cf2bea 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -211,7 +211,7 @@ public interface EndpointBuilderFactory extends
MicrometerEndpointBuilderFactory,
MiloClientEndpointBuilderFactory,
MiloServerEndpointBuilderFactory,
- Mina2EndpointBuilderFactory,
+ MinaEndpointBuilderFactory,
MllpEndpointBuilderFactory,
MockEndpointBuilderFactory,
MongoDbEndpointBuilderFactory,
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
similarity index 84%
rename from core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java
rename to core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
index b0b2bc2..7183058 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
@@ -31,17 +31,17 @@ import org.apache.camel.spi.ExceptionHandler;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface Mina2EndpointBuilderFactory {
+public interface MinaEndpointBuilderFactory {
/**
* Builder for endpoint consumers for the Mina component.
*/
- public interface Mina2EndpointConsumerBuilder
+ public interface MinaEndpointConsumerBuilder
extends
EndpointConsumerBuilder {
- default AdvancedMina2EndpointConsumerBuilder advanced() {
- return (AdvancedMina2EndpointConsumerBuilder) this;
+ default AdvancedMinaEndpointConsumerBuilder advanced() {
+ return (AdvancedMinaEndpointConsumerBuilder) this;
}
/**
* Whether or not to disconnect(close) from Mina session right after
@@ -51,7 +51,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder disconnect(boolean disconnect) {
+ default MinaEndpointConsumerBuilder disconnect(boolean disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -63,7 +63,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder disconnect(String disconnect) {
+ default MinaEndpointConsumerBuilder disconnect(String disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -75,7 +75,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder minaLogger(boolean minaLogger) {
+ default MinaEndpointConsumerBuilder minaLogger(boolean minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -87,7 +87,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder minaLogger(String minaLogger) {
+ default MinaEndpointConsumerBuilder minaLogger(String minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -98,7 +98,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder sync(boolean sync) {
+ default MinaEndpointConsumerBuilder sync(boolean sync) {
setProperty("sync", sync);
return this;
}
@@ -109,7 +109,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder sync(String sync) {
+ default MinaEndpointConsumerBuilder sync(String sync) {
setProperty("sync", sync);
return this;
}
@@ -122,7 +122,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder timeout(long timeout) {
+ default MinaEndpointConsumerBuilder timeout(long timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -135,7 +135,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder timeout(String timeout) {
+ default MinaEndpointConsumerBuilder timeout(String timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -147,7 +147,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder writeTimeout(long writeTimeout) {
+ default MinaEndpointConsumerBuilder writeTimeout(long writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -159,7 +159,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointConsumerBuilder writeTimeout(String writeTimeout) {
+ default MinaEndpointConsumerBuilder writeTimeout(String writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -176,7 +176,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer
*/
- default Mina2EndpointConsumerBuilder bridgeErrorHandler(
+ default MinaEndpointConsumerBuilder bridgeErrorHandler(
boolean bridgeErrorHandler) {
setProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
@@ -194,7 +194,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer
*/
- default Mina2EndpointConsumerBuilder bridgeErrorHandler(
+ default MinaEndpointConsumerBuilder bridgeErrorHandler(
String bridgeErrorHandler) {
setProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
@@ -207,7 +207,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer
*/
- default Mina2EndpointConsumerBuilder clientMode(boolean clientMode) {
+ default MinaEndpointConsumerBuilder clientMode(boolean clientMode) {
setProperty("clientMode", clientMode);
return this;
}
@@ -219,7 +219,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer
*/
- default Mina2EndpointConsumerBuilder clientMode(String clientMode) {
+ default MinaEndpointConsumerBuilder clientMode(String clientMode) {
setProperty("clientMode", clientMode);
return this;
}
@@ -235,7 +235,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder allowDefaultCodec(
+ default MinaEndpointConsumerBuilder allowDefaultCodec(
boolean allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
@@ -252,7 +252,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder allowDefaultCodec(
+ default MinaEndpointConsumerBuilder allowDefaultCodec(
String allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
@@ -265,7 +265,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder codec(Object codec) {
+ default MinaEndpointConsumerBuilder codec(Object codec) {
setProperty("codec", codec);
return this;
}
@@ -277,7 +277,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder codec(String codec) {
+ default MinaEndpointConsumerBuilder codec(String codec) {
setProperty("codec", codec);
return this;
}
@@ -289,7 +289,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder decoderMaxLineLength(
+ default MinaEndpointConsumerBuilder decoderMaxLineLength(
int decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -302,7 +302,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder decoderMaxLineLength(
+ default MinaEndpointConsumerBuilder decoderMaxLineLength(
String decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -315,7 +315,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder encoderMaxLineLength(
+ default MinaEndpointConsumerBuilder encoderMaxLineLength(
int encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -328,7 +328,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder encoderMaxLineLength(
+ default MinaEndpointConsumerBuilder encoderMaxLineLength(
String encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -342,7 +342,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder encoding(String encoding) {
+ default MinaEndpointConsumerBuilder encoding(String encoding) {
setProperty("encoding", encoding);
return this;
}
@@ -354,7 +354,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder filters(List<Object> filters) {
+ default MinaEndpointConsumerBuilder filters(List<Object> filters) {
setProperty("filters", filters);
return this;
}
@@ -366,7 +366,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder filters(String filters) {
+ default MinaEndpointConsumerBuilder filters(String filters) {
setProperty("filters", filters);
return this;
}
@@ -379,7 +379,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder textline(boolean textline) {
+ default MinaEndpointConsumerBuilder textline(boolean textline) {
setProperty("textline", textline);
return this;
}
@@ -392,7 +392,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder textline(String textline) {
+ default MinaEndpointConsumerBuilder textline(String textline) {
setProperty("textline", textline);
return this;
}
@@ -402,13 +402,13 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option is a:
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder textlineDelimiter(
- Mina2TextLineDelimiter textlineDelimiter) {
+ default MinaEndpointConsumerBuilder textlineDelimiter(
+ MinaTextLineDelimiter textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
}
@@ -418,12 +418,12 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option will be converted to a
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointConsumerBuilder textlineDelimiter(
+ default MinaEndpointConsumerBuilder textlineDelimiter(
String textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
@@ -435,7 +435,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointConsumerBuilder autoStartTls(boolean autoStartTls) {
+ default MinaEndpointConsumerBuilder autoStartTls(boolean autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -446,7 +446,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointConsumerBuilder autoStartTls(String autoStartTls) {
+ default MinaEndpointConsumerBuilder autoStartTls(String autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -458,7 +458,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointConsumerBuilder sslContextParameters(
+ default MinaEndpointConsumerBuilder sslContextParameters(
Object sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -471,7 +471,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointConsumerBuilder sslContextParameters(
+ default MinaEndpointConsumerBuilder sslContextParameters(
String sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -481,11 +481,11 @@ public interface Mina2EndpointBuilderFactory {
/**
* Advanced builder for endpoint consumers for the Mina component.
*/
- public interface AdvancedMina2EndpointConsumerBuilder
+ public interface AdvancedMinaEndpointConsumerBuilder
extends
EndpointConsumerBuilder {
- default Mina2EndpointConsumerBuilder basic() {
- return (Mina2EndpointConsumerBuilder) this;
+ default MinaEndpointConsumerBuilder basic() {
+ return (MinaEndpointConsumerBuilder) this;
}
/**
* If sync is enabled then this option dictates MinaConsumer if it
@@ -495,7 +495,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder disconnectOnNoReply(
+ default AdvancedMinaEndpointConsumerBuilder disconnectOnNoReply(
boolean disconnectOnNoReply) {
setProperty("disconnectOnNoReply", disconnectOnNoReply);
return this;
@@ -508,7 +508,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder disconnectOnNoReply(
+ default AdvancedMinaEndpointConsumerBuilder disconnectOnNoReply(
String disconnectOnNoReply) {
setProperty("disconnectOnNoReply", disconnectOnNoReply);
return this;
@@ -524,7 +524,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder exceptionHandler(
+ default AdvancedMinaEndpointConsumerBuilder exceptionHandler(
ExceptionHandler exceptionHandler) {
setProperty("exceptionHandler", exceptionHandler);
return this;
@@ -540,7 +540,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder exceptionHandler(
+ default AdvancedMinaEndpointConsumerBuilder exceptionHandler(
String exceptionHandler) {
setProperty("exceptionHandler", exceptionHandler);
return this;
@@ -552,7 +552,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder exchangePattern(
+ default AdvancedMinaEndpointConsumerBuilder exchangePattern(
ExchangePattern exchangePattern) {
setProperty("exchangePattern", exchangePattern);
return this;
@@ -565,7 +565,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder exchangePattern(
+ default AdvancedMinaEndpointConsumerBuilder exchangePattern(
String exchangePattern) {
setProperty("exchangePattern", exchangePattern);
return this;
@@ -578,7 +578,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder noReplyLogLevel(
+ default AdvancedMinaEndpointConsumerBuilder noReplyLogLevel(
LoggingLevel noReplyLogLevel) {
setProperty("noReplyLogLevel", noReplyLogLevel);
return this;
@@ -592,7 +592,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: consumer (advanced)
*/
- default AdvancedMina2EndpointConsumerBuilder noReplyLogLevel(
+ default AdvancedMinaEndpointConsumerBuilder noReplyLogLevel(
String noReplyLogLevel) {
setProperty("noReplyLogLevel", noReplyLogLevel);
return this;
@@ -605,7 +605,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointConsumerBuilder basicPropertyBinding(
boolean basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -618,7 +618,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointConsumerBuilder basicPropertyBinding(
String basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -630,7 +630,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder maximumPoolSize(
+ default AdvancedMinaEndpointConsumerBuilder maximumPoolSize(
int maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
@@ -642,7 +642,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder maximumPoolSize(
+ default AdvancedMinaEndpointConsumerBuilder maximumPoolSize(
String maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
@@ -655,7 +655,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointConsumerBuilder orderedThreadPoolExecutor(
boolean orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -668,7 +668,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointConsumerBuilder orderedThreadPoolExecutor(
String orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -681,7 +681,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder synchronous(
+ default AdvancedMinaEndpointConsumerBuilder synchronous(
boolean synchronous) {
setProperty("synchronous", synchronous);
return this;
@@ -694,7 +694,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder synchronous(
+ default AdvancedMinaEndpointConsumerBuilder synchronous(
String synchronous) {
setProperty("synchronous", synchronous);
return this;
@@ -711,7 +711,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder transferExchange(
+ default AdvancedMinaEndpointConsumerBuilder transferExchange(
boolean transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -728,7 +728,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointConsumerBuilder transferExchange(
+ default AdvancedMinaEndpointConsumerBuilder transferExchange(
String transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -738,11 +738,11 @@ public interface Mina2EndpointBuilderFactory {
/**
* Builder for endpoint producers for the Mina component.
*/
- public interface Mina2EndpointProducerBuilder
+ public interface MinaEndpointProducerBuilder
extends
EndpointProducerBuilder {
- default AdvancedMina2EndpointProducerBuilder advanced() {
- return (AdvancedMina2EndpointProducerBuilder) this;
+ default AdvancedMinaEndpointProducerBuilder advanced() {
+ return (AdvancedMinaEndpointProducerBuilder) this;
}
/**
* Whether or not to disconnect(close) from Mina session right after
@@ -752,7 +752,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder disconnect(boolean disconnect) {
+ default MinaEndpointProducerBuilder disconnect(boolean disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -764,7 +764,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder disconnect(String disconnect) {
+ default MinaEndpointProducerBuilder disconnect(String disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -776,7 +776,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder minaLogger(boolean minaLogger) {
+ default MinaEndpointProducerBuilder minaLogger(boolean minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -788,7 +788,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder minaLogger(String minaLogger) {
+ default MinaEndpointProducerBuilder minaLogger(String minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -799,7 +799,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder sync(boolean sync) {
+ default MinaEndpointProducerBuilder sync(boolean sync) {
setProperty("sync", sync);
return this;
}
@@ -810,7 +810,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder sync(String sync) {
+ default MinaEndpointProducerBuilder sync(String sync) {
setProperty("sync", sync);
return this;
}
@@ -823,7 +823,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder timeout(long timeout) {
+ default MinaEndpointProducerBuilder timeout(long timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -836,7 +836,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder timeout(String timeout) {
+ default MinaEndpointProducerBuilder timeout(String timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -848,7 +848,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder writeTimeout(long writeTimeout) {
+ default MinaEndpointProducerBuilder writeTimeout(long writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -860,7 +860,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointProducerBuilder writeTimeout(String writeTimeout) {
+ default MinaEndpointProducerBuilder writeTimeout(String writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -879,7 +879,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer
*/
- default Mina2EndpointProducerBuilder lazyStartProducer(
+ default MinaEndpointProducerBuilder lazyStartProducer(
boolean lazyStartProducer) {
setProperty("lazyStartProducer", lazyStartProducer);
return this;
@@ -899,7 +899,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer
*/
- default Mina2EndpointProducerBuilder lazyStartProducer(
+ default MinaEndpointProducerBuilder lazyStartProducer(
String lazyStartProducer) {
setProperty("lazyStartProducer", lazyStartProducer);
return this;
@@ -916,7 +916,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder allowDefaultCodec(
+ default MinaEndpointProducerBuilder allowDefaultCodec(
boolean allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
@@ -933,7 +933,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder allowDefaultCodec(
+ default MinaEndpointProducerBuilder allowDefaultCodec(
String allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
@@ -946,7 +946,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder codec(Object codec) {
+ default MinaEndpointProducerBuilder codec(Object codec) {
setProperty("codec", codec);
return this;
}
@@ -958,7 +958,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder codec(String codec) {
+ default MinaEndpointProducerBuilder codec(String codec) {
setProperty("codec", codec);
return this;
}
@@ -970,7 +970,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder decoderMaxLineLength(
+ default MinaEndpointProducerBuilder decoderMaxLineLength(
int decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -983,7 +983,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder decoderMaxLineLength(
+ default MinaEndpointProducerBuilder decoderMaxLineLength(
String decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -996,7 +996,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder encoderMaxLineLength(
+ default MinaEndpointProducerBuilder encoderMaxLineLength(
int encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -1009,7 +1009,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder encoderMaxLineLength(
+ default MinaEndpointProducerBuilder encoderMaxLineLength(
String encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -1023,7 +1023,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder encoding(String encoding) {
+ default MinaEndpointProducerBuilder encoding(String encoding) {
setProperty("encoding", encoding);
return this;
}
@@ -1035,7 +1035,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder filters(List<Object> filters) {
+ default MinaEndpointProducerBuilder filters(List<Object> filters) {
setProperty("filters", filters);
return this;
}
@@ -1047,7 +1047,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder filters(String filters) {
+ default MinaEndpointProducerBuilder filters(String filters) {
setProperty("filters", filters);
return this;
}
@@ -1060,7 +1060,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder textline(boolean textline) {
+ default MinaEndpointProducerBuilder textline(boolean textline) {
setProperty("textline", textline);
return this;
}
@@ -1073,7 +1073,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder textline(String textline) {
+ default MinaEndpointProducerBuilder textline(String textline) {
setProperty("textline", textline);
return this;
}
@@ -1083,13 +1083,13 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option is a:
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder textlineDelimiter(
- Mina2TextLineDelimiter textlineDelimiter) {
+ default MinaEndpointProducerBuilder textlineDelimiter(
+ MinaTextLineDelimiter textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
}
@@ -1099,12 +1099,12 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option will be converted to a
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointProducerBuilder textlineDelimiter(
+ default MinaEndpointProducerBuilder textlineDelimiter(
String textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
@@ -1116,7 +1116,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointProducerBuilder autoStartTls(boolean autoStartTls) {
+ default MinaEndpointProducerBuilder autoStartTls(boolean autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -1127,7 +1127,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointProducerBuilder autoStartTls(String autoStartTls) {
+ default MinaEndpointProducerBuilder autoStartTls(String autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -1139,7 +1139,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointProducerBuilder sslContextParameters(
+ default MinaEndpointProducerBuilder sslContextParameters(
Object sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -1152,7 +1152,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointProducerBuilder sslContextParameters(
+ default MinaEndpointProducerBuilder sslContextParameters(
String sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -1162,11 +1162,11 @@ public interface Mina2EndpointBuilderFactory {
/**
* Advanced builder for endpoint producers for the Mina component.
*/
- public interface AdvancedMina2EndpointProducerBuilder
+ public interface AdvancedMinaEndpointProducerBuilder
extends
EndpointProducerBuilder {
- default Mina2EndpointProducerBuilder basic() {
- return (Mina2EndpointProducerBuilder) this;
+ default MinaEndpointProducerBuilder basic() {
+ return (MinaEndpointProducerBuilder) this;
}
/**
* Whether to create the InetAddress once and reuse. Setting this to
@@ -1176,7 +1176,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer (advanced)
*/
- default AdvancedMina2EndpointProducerBuilder cachedAddress(
+ default AdvancedMinaEndpointProducerBuilder cachedAddress(
boolean cachedAddress) {
setProperty("cachedAddress", cachedAddress);
return this;
@@ -1189,7 +1189,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer (advanced)
*/
- default AdvancedMina2EndpointProducerBuilder cachedAddress(
+ default AdvancedMinaEndpointProducerBuilder cachedAddress(
String cachedAddress) {
setProperty("cachedAddress", cachedAddress);
return this;
@@ -1202,7 +1202,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer (advanced)
*/
- default AdvancedMina2EndpointProducerBuilder lazySessionCreation(
+ default AdvancedMinaEndpointProducerBuilder lazySessionCreation(
boolean lazySessionCreation) {
setProperty("lazySessionCreation", lazySessionCreation);
return this;
@@ -1215,7 +1215,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: producer (advanced)
*/
- default AdvancedMina2EndpointProducerBuilder lazySessionCreation(
+ default AdvancedMinaEndpointProducerBuilder lazySessionCreation(
String lazySessionCreation) {
setProperty("lazySessionCreation", lazySessionCreation);
return this;
@@ -1228,7 +1228,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointProducerBuilder basicPropertyBinding(
boolean basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -1241,7 +1241,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointProducerBuilder basicPropertyBinding(
String basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -1253,7 +1253,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder maximumPoolSize(
+ default AdvancedMinaEndpointProducerBuilder maximumPoolSize(
int maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
@@ -1265,7 +1265,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder maximumPoolSize(
+ default AdvancedMinaEndpointProducerBuilder maximumPoolSize(
String maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
@@ -1278,7 +1278,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointProducerBuilder orderedThreadPoolExecutor(
boolean orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -1291,7 +1291,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointProducerBuilder orderedThreadPoolExecutor(
String orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -1304,7 +1304,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder synchronous(
+ default AdvancedMinaEndpointProducerBuilder synchronous(
boolean synchronous) {
setProperty("synchronous", synchronous);
return this;
@@ -1317,7 +1317,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder synchronous(
+ default AdvancedMinaEndpointProducerBuilder synchronous(
String synchronous) {
setProperty("synchronous", synchronous);
return this;
@@ -1334,7 +1334,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder transferExchange(
+ default AdvancedMinaEndpointProducerBuilder transferExchange(
boolean transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -1351,7 +1351,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointProducerBuilder transferExchange(
+ default AdvancedMinaEndpointProducerBuilder transferExchange(
String transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -1361,11 +1361,11 @@ public interface Mina2EndpointBuilderFactory {
/**
* Builder for endpoint for the Mina component.
*/
- public interface Mina2EndpointBuilder
+ public interface MinaEndpointBuilder
extends
- Mina2EndpointConsumerBuilder, Mina2EndpointProducerBuilder {
- default AdvancedMina2EndpointBuilder advanced() {
- return (AdvancedMina2EndpointBuilder) this;
+ MinaEndpointConsumerBuilder, MinaEndpointProducerBuilder {
+ default AdvancedMinaEndpointBuilder advanced() {
+ return (AdvancedMinaEndpointBuilder) this;
}
/**
* Whether or not to disconnect(close) from Mina session right after
@@ -1375,7 +1375,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder disconnect(boolean disconnect) {
+ default MinaEndpointBuilder disconnect(boolean disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -1387,7 +1387,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder disconnect(String disconnect) {
+ default MinaEndpointBuilder disconnect(String disconnect) {
setProperty("disconnect", disconnect);
return this;
}
@@ -1399,7 +1399,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder minaLogger(boolean minaLogger) {
+ default MinaEndpointBuilder minaLogger(boolean minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -1411,7 +1411,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder minaLogger(String minaLogger) {
+ default MinaEndpointBuilder minaLogger(String minaLogger) {
setProperty("minaLogger", minaLogger);
return this;
}
@@ -1422,7 +1422,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder sync(boolean sync) {
+ default MinaEndpointBuilder sync(boolean sync) {
setProperty("sync", sync);
return this;
}
@@ -1433,7 +1433,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder sync(String sync) {
+ default MinaEndpointBuilder sync(String sync) {
setProperty("sync", sync);
return this;
}
@@ -1446,7 +1446,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder timeout(long timeout) {
+ default MinaEndpointBuilder timeout(long timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -1459,7 +1459,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder timeout(String timeout) {
+ default MinaEndpointBuilder timeout(String timeout) {
setProperty("timeout", timeout);
return this;
}
@@ -1471,7 +1471,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder writeTimeout(long writeTimeout) {
+ default MinaEndpointBuilder writeTimeout(long writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -1483,7 +1483,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: common
*/
- default Mina2EndpointBuilder writeTimeout(String writeTimeout) {
+ default MinaEndpointBuilder writeTimeout(String writeTimeout) {
setProperty("writeTimeout", writeTimeout);
return this;
}
@@ -1499,7 +1499,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder allowDefaultCodec(boolean allowDefaultCodec) {
+ default MinaEndpointBuilder allowDefaultCodec(boolean allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
}
@@ -1515,7 +1515,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder allowDefaultCodec(String allowDefaultCodec) {
+ default MinaEndpointBuilder allowDefaultCodec(String allowDefaultCodec) {
setProperty("allowDefaultCodec", allowDefaultCodec);
return this;
}
@@ -1527,7 +1527,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder codec(Object codec) {
+ default MinaEndpointBuilder codec(Object codec) {
setProperty("codec", codec);
return this;
}
@@ -1539,7 +1539,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder codec(String codec) {
+ default MinaEndpointBuilder codec(String codec) {
setProperty("codec", codec);
return this;
}
@@ -1551,7 +1551,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder decoderMaxLineLength(
+ default MinaEndpointBuilder decoderMaxLineLength(
int decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -1564,7 +1564,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder decoderMaxLineLength(
+ default MinaEndpointBuilder decoderMaxLineLength(
String decoderMaxLineLength) {
setProperty("decoderMaxLineLength", decoderMaxLineLength);
return this;
@@ -1577,7 +1577,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder encoderMaxLineLength(
+ default MinaEndpointBuilder encoderMaxLineLength(
int encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -1590,7 +1590,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder encoderMaxLineLength(
+ default MinaEndpointBuilder encoderMaxLineLength(
String encoderMaxLineLength) {
setProperty("encoderMaxLineLength", encoderMaxLineLength);
return this;
@@ -1604,7 +1604,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder encoding(String encoding) {
+ default MinaEndpointBuilder encoding(String encoding) {
setProperty("encoding", encoding);
return this;
}
@@ -1616,7 +1616,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder filters(List<Object> filters) {
+ default MinaEndpointBuilder filters(List<Object> filters) {
setProperty("filters", filters);
return this;
}
@@ -1628,7 +1628,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder filters(String filters) {
+ default MinaEndpointBuilder filters(String filters) {
setProperty("filters", filters);
return this;
}
@@ -1641,7 +1641,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder textline(boolean textline) {
+ default MinaEndpointBuilder textline(boolean textline) {
setProperty("textline", textline);
return this;
}
@@ -1654,7 +1654,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: codec
*/
- default Mina2EndpointBuilder textline(String textline) {
+ default MinaEndpointBuilder textline(String textline) {
setProperty("textline", textline);
return this;
}
@@ -1664,13 +1664,13 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option is a:
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointBuilder textlineDelimiter(
- Mina2TextLineDelimiter textlineDelimiter) {
+ default MinaEndpointBuilder textlineDelimiter(
+ MinaTextLineDelimiter textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
}
@@ -1680,12 +1680,12 @@ public interface Mina2EndpointBuilderFactory {
* used to mark the end of text.
*
* The option will be converted to a
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code>
* type.
*
* Group: codec
*/
- default Mina2EndpointBuilder textlineDelimiter(String textlineDelimiter) {
+ default MinaEndpointBuilder textlineDelimiter(String textlineDelimiter) {
setProperty("textlineDelimiter", textlineDelimiter);
return this;
}
@@ -1696,7 +1696,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointBuilder autoStartTls(boolean autoStartTls) {
+ default MinaEndpointBuilder autoStartTls(boolean autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -1707,7 +1707,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointBuilder autoStartTls(String autoStartTls) {
+ default MinaEndpointBuilder autoStartTls(String autoStartTls) {
setProperty("autoStartTls", autoStartTls);
return this;
}
@@ -1719,7 +1719,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointBuilder sslContextParameters(
+ default MinaEndpointBuilder sslContextParameters(
Object sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -1732,7 +1732,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: security
*/
- default Mina2EndpointBuilder sslContextParameters(
+ default MinaEndpointBuilder sslContextParameters(
String sslContextParameters) {
setProperty("sslContextParameters", sslContextParameters);
return this;
@@ -1742,11 +1742,11 @@ public interface Mina2EndpointBuilderFactory {
/**
* Advanced builder for endpoint for the Mina component.
*/
- public interface AdvancedMina2EndpointBuilder
+ public interface AdvancedMinaEndpointBuilder
extends
- AdvancedMina2EndpointConsumerBuilder, AdvancedMina2EndpointProducerBuilder {
- default Mina2EndpointBuilder basic() {
- return (Mina2EndpointBuilder) this;
+ AdvancedMinaEndpointConsumerBuilder, AdvancedMinaEndpointProducerBuilder {
+ default MinaEndpointBuilder basic() {
+ return (MinaEndpointBuilder) this;
}
/**
* Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -1756,7 +1756,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointBuilder basicPropertyBinding(
boolean basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -1769,7 +1769,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder basicPropertyBinding(
+ default AdvancedMinaEndpointBuilder basicPropertyBinding(
String basicPropertyBinding) {
setProperty("basicPropertyBinding", basicPropertyBinding);
return this;
@@ -1781,7 +1781,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder maximumPoolSize(int maximumPoolSize) {
+ default AdvancedMinaEndpointBuilder maximumPoolSize(int maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
}
@@ -1792,7 +1792,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder maximumPoolSize(
+ default AdvancedMinaEndpointBuilder maximumPoolSize(
String maximumPoolSize) {
setProperty("maximumPoolSize", maximumPoolSize);
return this;
@@ -1805,7 +1805,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointBuilder orderedThreadPoolExecutor(
boolean orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -1818,7 +1818,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder orderedThreadPoolExecutor(
+ default AdvancedMinaEndpointBuilder orderedThreadPoolExecutor(
String orderedThreadPoolExecutor) {
setProperty("orderedThreadPoolExecutor", orderedThreadPoolExecutor);
return this;
@@ -1831,7 +1831,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder synchronous(boolean synchronous) {
+ default AdvancedMinaEndpointBuilder synchronous(boolean synchronous) {
setProperty("synchronous", synchronous);
return this;
}
@@ -1843,7 +1843,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder synchronous(String synchronous) {
+ default AdvancedMinaEndpointBuilder synchronous(String synchronous) {
setProperty("synchronous", synchronous);
return this;
}
@@ -1859,7 +1859,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder transferExchange(
+ default AdvancedMinaEndpointBuilder transferExchange(
boolean transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -1876,7 +1876,7 @@ public interface Mina2EndpointBuilderFactory {
*
* Group: advanced
*/
- default AdvancedMina2EndpointBuilder transferExchange(
+ default AdvancedMinaEndpointBuilder transferExchange(
String transferExchange) {
setProperty("transferExchange", transferExchange);
return this;
@@ -1885,10 +1885,9 @@ public interface Mina2EndpointBuilderFactory {
/**
* Proxy enum for
- * <code>org.apache.camel.component.mina2.Mina2TextLineDelimiter</code>
- * enum.
+ * <code>org.apache.camel.component.mina.MinaTextLineDelimiter</code> enum.
*/
- enum Mina2TextLineDelimiter {
+ enum MinaTextLineDelimiter {
DEFAULT,
AUTO,
UNIX,
@@ -1916,12 +1915,12 @@ public interface Mina2EndpointBuilderFactory {
* Path parameter: port (required)
* Port number
*/
- default Mina2EndpointBuilder mina2(String path) {
- class Mina2EndpointBuilderImpl extends AbstractEndpointBuilder implements Mina2EndpointBuilder, AdvancedMina2EndpointBuilder {
- public Mina2EndpointBuilderImpl(String path) {
+ default MinaEndpointBuilder mina(String path) {
+ class MinaEndpointBuilderImpl extends AbstractEndpointBuilder implements MinaEndpointBuilder, AdvancedMinaEndpointBuilder {
+ public MinaEndpointBuilderImpl(String path) {
super("mina", path);
}
}
- return new Mina2EndpointBuilderImpl(path);
+ return new MinaEndpointBuilderImpl(path);
}
}
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc
index 0d0b497..158ce1a 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -464,4 +464,3 @@ Spring DSL based configuration of endpoint
<to uri="ahc:https://localhost/foo?sslContextParameters=#sslContextParameters"/>
...
----------------------------------------------------------------------------------
-
diff --git a/docs/components/modules/ROOT/pages/jpa-component.adoc b/docs/components/modules/ROOT/pages/jpa-component.adoc
index 5d8ad5b..3910fcc 100644
--- a/docs/components/modules/ROOT/pages/jpa-component.adoc
+++ b/docs/components/modules/ROOT/pages/jpa-component.adoc
@@ -466,5 +466,3 @@ argument to the JVM:
-javaagent:<path_to_your_local_m2_cache>/org/apache/openjpa/openjpa/2.2.1/openjpa-2.2.1.jar
-------------------------------------------------------------------------------------------
-
-
diff --git a/docs/components/modules/ROOT/pages/mina-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc
index f39cdf5..d87df26 100644
--- a/docs/components/modules/ROOT/pages/mina-component.adoc
+++ b/docs/components/modules/ROOT/pages/mina-component.adoc
@@ -3,7 +3,7 @@
*Available as of Camel version 2.10*
-The Mina2 component is a transport for working with
+The Mina component is a transport for working with
http://mina.apache.org/[Apache MINA 2.x]
TIP: Favor using xref:netty-component.adoc[Netty] as Netty is a much more active
@@ -71,7 +71,7 @@ The Mina component supports 3 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *configuration* (advanced) | To use the shared mina configuration. | | Mina2Configuration
+| *configuration* (advanced) | To use the shared mina configuration. | | MinaConfiguration
| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
|===
@@ -137,7 +137,7 @@ with the following path and query parameters:
| *encoding* (codec) | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
| *filters* (codec) | You can set a list of Mina IoFilters to use. | | List
| *textline* (codec) | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | boolean
-| *textlineDelimiter* (codec) | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *textlineDelimiter* (codec) | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | MinaTextLineDelimiter
| *autoStartTls* (security) | Whether to auto start SSL handshake. | true | boolean
| *sslContextParameters* (security) | To configure SSL security. | | SSLContextParameters
|===
@@ -188,7 +188,7 @@ The component supports 29 options, which are listed below.
| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | MinaTextLineDelimiter
| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
@@ -227,9 +227,9 @@ it on port 6200.
-------------------------------------------------------------------------------------------------
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
-
+
template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
-
+
assertMockEndpointsSatisfied();
-------------------------------------------------------------------------------------------------
@@ -303,7 +303,7 @@ written the `bye` message back to the client:
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
- exchange.getOut().setHeader(Mina2Constants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
+ exchange.getOut().setHeader(MinaConstants.MINA_CLOSE_SESSION_WHEN_COMPLETE, true);
}
});
---------------------------------------------------------------------------------------------------
@@ -311,9 +311,9 @@ written the `bye` message back to the client:
== Get the IoSession for message
You can get the IoSession from the message header with this key
-`Mina2Constants.MINA_IOSESSION`, and also get the local host address
-with the key `Mina2Constants.MINA_LOCAL_ADDRESS` and remote host address
-with the key `Mina2Constants.MINA_REMOTE_ADDRESS`.
+`MinaConstants.MINA_IOSESSION`, and also get the local host address
+with the key `MinaConstants.MINA_LOCAL_ADDRESS` and remote host address
+with the key `MinaConstants.MINA_REMOTE_ADDRESS`.
== Configuring Mina filters
diff --git a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
index 1d41d5c..0957784 100644
--- a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
@@ -172,4 +172,3 @@ public class SomeBean {
}
----
-
diff --git a/parent/pom.xml b/parent/pom.xml
index 7c33e2c..82751d5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -451,7 +451,7 @@
<micrometer-version>1.2.0</micrometer-version>
<milo-version>0.2.5</milo-version>
<mimepull-version>1.9.11</mimepull-version>
- <mina2-version>2.0.21</mina2-version>
+ <mina-version>2.0.21</mina-version>
<minidns-version>0.3.4</minidns-version>
<minimal-json-version>0.9.5</minimal-json-version>
<mock-javamail-version>1.9</mock-javamail-version>
@@ -4630,7 +4630,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina2-version}</version>
+ <version>${mina-version}</version>
</dependency>
<dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 239775e..842e053 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -172,7 +172,7 @@
</feature>
<feature name='camel-apns' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-databind-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -1252,7 +1252,7 @@
</feature>
<feature name='camel-hl7' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-netty</feature>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${project.version}</bundle>
</feature>
@@ -1638,7 +1638,7 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ldif/${project.version}</bundle>
</feature>
<feature name='camel-linkedin' version='${project.version}' start-level='50'>
@@ -1772,7 +1772,7 @@
</feature>
<feature name='camel-mina' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mina/${project.version}</bundle>
</feature>
<feature name='camel-mllp' version='${project.version}' start-level='50'>
@@ -2061,7 +2061,7 @@
</feature>
<feature name='camel-quickfix' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.quickfixj/quickfixj-all/${quickfixj-version}</bundle>
@@ -2432,7 +2432,7 @@
</feature>
<feature name='camel-ssh' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle dependency='true'>mvn:org.apache.sshd/sshd-core/${sshd-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}</bundle>
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
similarity index 88%
rename from platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
index ce3100c..afba2da 100644
--- a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2.springboot;
+package org.apache.camel.component.mina.springboot;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.mina2.Mina2Component;
+import org.apache.camel.component.mina.MinaComponent;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spi.HasId;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
@@ -51,22 +51,22 @@ import org.springframework.context.annotation.Lazy;
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
@Configuration
@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
- Mina2ComponentAutoConfiguration.GroupConditions.class})
+ MinaComponentAutoConfiguration.GroupConditions.class})
@AutoConfigureAfter(CamelAutoConfiguration.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,
- Mina2ComponentConfiguration.class})
-public class Mina2ComponentAutoConfiguration {
+ MinaComponentConfiguration.class})
+public class MinaComponentAutoConfiguration {
private static final Logger LOGGER = LoggerFactory
- .getLogger(Mina2ComponentAutoConfiguration.class);
+ .getLogger(MinaComponentAutoConfiguration.class);
@Autowired
private ApplicationContext applicationContext;
@Autowired
private CamelContext camelContext;
@Autowired
- private Mina2ComponentConfiguration configuration;
+ private MinaComponentConfiguration configuration;
@Autowired(required = false)
- private List<ComponentCustomizer<Mina2Component>> customizers;
+ private List<ComponentCustomizer<MinaComponent>> customizers;
static class GroupConditions extends GroupCondition {
public GroupConditions() {
@@ -76,9 +76,9 @@ public class Mina2ComponentAutoConfiguration {
@Lazy
@Bean(name = "mina-component")
- @ConditionalOnMissingBean(Mina2Component.class)
- public Mina2Component configureMina2Component() throws Exception {
- Mina2Component component = new Mina2Component();
+ @ConditionalOnMissingBean(MinaComponent.class)
+ public MinaComponent configureMinaComponent() throws Exception {
+ MinaComponent component = new MinaComponent();
component.setCamelContext(camelContext);
Map<String, Object> parameters = new HashMap<>();
IntrospectionSupport.getProperties(configuration, parameters, null,
@@ -105,7 +105,7 @@ public class Mina2ComponentAutoConfiguration {
CamelPropertiesHelper.setCamelProperties(camelContext, component,
parameters, false);
if (ObjectHelper.isNotEmpty(customizers)) {
- for (ComponentCustomizer<Mina2Component> customizer : customizers) {
+ for (ComponentCustomizer<MinaComponent> customizer : customizers) {
boolean useCustomizer = (customizer instanceof HasId)
? HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
index 3624a23..0983995 100644
--- a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentConfiguration.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.mina2.springboot;
+package org.apache.camel.component.mina.springboot;
import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.component.mina2.Mina2TextLineDelimiter;
+import org.apache.camel.component.mina.MinaTextLineDelimiter;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -32,7 +32,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*/
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
@ConfigurationProperties(prefix = "camel.component.mina")
-public class Mina2ComponentConfiguration
+public class MinaComponentConfiguration
extends
ComponentConfigurationPropertiesCommon {
@@ -44,7 +44,7 @@ public class Mina2ComponentConfiguration
/**
* To use the shared mina configuration.
*/
- private Mina2ConfigurationNestedConfiguration configuration;
+ private MinaConfigurationNestedConfiguration configuration;
/**
* Enable usage of global SSL context parameters.
*/
@@ -55,12 +55,12 @@ public class Mina2ComponentConfiguration
*/
private Boolean basicPropertyBinding = false;
- public Mina2ConfigurationNestedConfiguration getConfiguration() {
+ public MinaConfigurationNestedConfiguration getConfiguration() {
return configuration;
}
public void setConfiguration(
- Mina2ConfigurationNestedConfiguration configuration) {
+ MinaConfigurationNestedConfiguration configuration) {
this.configuration = configuration;
}
@@ -81,8 +81,8 @@ public class Mina2ComponentConfiguration
this.basicPropertyBinding = basicPropertyBinding;
}
- public static class Mina2ConfigurationNestedConfiguration {
- public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.mina2.Mina2Configuration.class;
+ public static class MinaConfigurationNestedConfiguration {
+ public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.mina.MinaConfiguration.class;
/**
* Protocol to use
*/
@@ -112,7 +112,7 @@ public class Mina2ComponentConfiguration
* to use. If none provided, Camel will use DEFAULT. This delimiter is
* used to mark the end of text.
*/
- private Mina2TextLineDelimiter textlineDelimiter;
+ private MinaTextLineDelimiter textlineDelimiter;
/**
* To use a custom minda codec implementation.
*/
@@ -259,12 +259,11 @@ public class Mina2ComponentConfiguration
this.textline = textline;
}
- public Mina2TextLineDelimiter getTextlineDelimiter() {
+ public MinaTextLineDelimiter getTextlineDelimiter() {
return textlineDelimiter;
}
- public void setTextlineDelimiter(
- Mina2TextLineDelimiter textlineDelimiter) {
+ public void setTextlineDelimiter(MinaTextLineDelimiter textlineDelimiter) {
this.textlineDelimiter = textlineDelimiter;
}
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories
index c5b6d65..5060ac4 100644
--- a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,5 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.mina2.springboot.Mina2ComponentAutoConfiguration
+org.apache.camel.component.mina.springboot.MinaComponentAutoConfiguration
+
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
index abc2af6..07863af 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
@@ -35,7 +35,7 @@ public class CamelMinaTest extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelMinaTest.class))
- .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseMina2Test$)")
+ .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseMinaTest$)")
.build();
}
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 624658a..280448c 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -181,11 +181,11 @@
<scope>test</scope>
</dependency>
- <!-- ftpserver using mina2 -->
+ <!-- ftpserver using mina -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina2-version}</version>
+ <version>${mina-version}</version>
<scope>test</scope>
</dependency>