You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/28 09:52:33 UTC
[1/2] git commit: CAMEL-6555 clean up the code camel-netty4
Repository: camel
Updated Branches:
refs/heads/master 29c2a5211 -> f1cf1397b
CAMEL-6555 clean up the code camel-netty4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/661924ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/661924ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/661924ad
Branch: refs/heads/master
Commit: 661924ad4eb9386719b49b2495dbaad68271d424
Parents: 29c2a52
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jul 28 15:42:55 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Jul 28 15:42:55 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/netty4/NettyProducer.java | 3 +--
.../component/netty4/SingleUDPNettyServerBootstrapFactory.java | 1 -
.../org/apache/camel/component/netty4/NettyConverterTest.java | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/661924ad/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
index c0e5360..2183f6f 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
@@ -21,12 +21,10 @@ import java.net.InetSocketAddress;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import io.netty.bootstrap.Bootstrap;
-import io.netty.bootstrap.ChannelFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
@@ -40,6 +38,7 @@ import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.HashedWheelTimer;
import io.netty.util.Timer;
import io.netty.util.concurrent.ImmediateEventExecutor;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
http://git-wip-us.apache.org/repos/asf/camel/blob/661924ad/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
index 935b714..8d42699 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
@@ -54,7 +54,6 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
private NettyServerBootstrapConfiguration configuration;
private ChannelInitializer<Channel> pipelineFactory;
private NetworkInterface multicastNetworkInterface;
- private DatagramChannel datagramChannel;
private Channel channel;
private EventLoopGroup workerGroup;
http://git-wip-us.apache.org/repos/asf/camel/blob/661924ad/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
index 8d856ed..bb4f8a1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty4;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.PooledByteBufAllocator;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
[2/2] git commit: CAMEL-6555 Added camel-netty4 into release kit
Posted by ni...@apache.org.
CAMEL-6555 Added camel-netty4 into release kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1cf1397
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1cf1397
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1cf1397
Branch: refs/heads/master
Commit: f1cf1397b04044baef4cc38315016be0bf7ebf49
Parents: 661924a
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jul 28 15:52:19 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Jul 28 15:52:19 2014 +0800
----------------------------------------------------------------------
apache-camel/pom.xml | 24 ++++++++++++--------
.../src/main/descriptors/common-bin.xml | 1 +
components/pom.xml | 1 +
parent/pom.xml | 5 ++++
4 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f1cf1397/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 6a0c6db..f9ca9ba 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -185,11 +185,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-eventadmin</artifactId>
+ <artifactId>camel-eventadmin</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-exec</artifactId>
+ <artifactId>camel-exec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -362,7 +362,7 @@
<exclusions>
<exclusion>
<groupId>net.sf.jt400</groupId>
- <artifactId>jt400-full</artifactId>
+ <artifactId>jt400-full</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -440,6 +440,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-netty4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-netty-http</artifactId>
</dependency>
<dependency>
@@ -453,7 +457,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-optaplanner</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-paxlogging</artifactId>
@@ -573,7 +577,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-batch</artifactId>
@@ -637,11 +641,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-blueprint</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
@@ -653,7 +657,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-testng</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-twitter</artifactId>
@@ -797,7 +801,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <optional>true</optional>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -859,7 +863,7 @@
<descriptors>
<descriptor>src/main/descriptors/src.xml</descriptor>
</descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/camel/blob/f1cf1397/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index b142f19..87e5607 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -121,6 +121,7 @@
<include>org.apache.camel:camel-mybatis</include>
<include>org.apache.camel:camel-nagios</include>
<include>org.apache.camel:camel-netty</include>
+ <include>org.apache.camel:camel-netty4</include>
<include>org.apache.camel:camel-netty-http</include>
<include>org.apache.camel:camel-ognl</include>
<include>org.apache.camel:camel-openshift</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/f1cf1397/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 159bd55..e6f22ca 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -142,6 +142,7 @@
<module>camel-mybatis</module>
<module>camel-nagios</module>
<module>camel-netty</module>
+ <module>camel-netty4</module>
<module>camel-netty-http</module>
<module>camel-ognl</module>
<module>camel-openshift</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/f1cf1397/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index af50c47..580013a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1015,6 +1015,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-netty4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty-http</artifactId>
<version>${project.version}</version>