honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to netty 3.2.0 CR1

This commit is contained in:
kimchy 2010-05-12 04:03:20 +03:00
parent fdf6eb9cb2
commit f6509930c7
13 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/libraries/netty.xml
View File

@ -1,11 +1,11 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="netty"> <library name="netty">
<CLASSES> <CLASSES>
<root url="jar://$GRADLE_REPOSITORY$/org.jboss.netty/netty/bundles/netty-3.1.5.GA.jar!/" /> <root url="jar://$GRADLE_REPOSITORY$/org.jboss.netty/netty/bundles/netty-3.2.0.CR1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/../../../opt/netty/3.1.5.GA/src/main/java" /> <root url="file://$PROJECT_DIR$/../../../opt/netty/3.2.0.CR1/src/main/java" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

2
build.gradle
View File

@ -36,7 +36,7 @@ allprojects {
repositories { repositories {
mavenCentral() mavenCentral()
mavenRepo urls: 'http://repository.jboss.com/maven2/' mavenRepo urls: 'https://repository.jboss.org/nexus/content/groups/public/'
mavenRepo urls: 'http://elasticsearch.googlecode.com/svn/maven' mavenRepo urls: 'http://elasticsearch.googlecode.com/svn/maven'
} }
} }

2
modules/elasticsearch/build.gradle
View File

@ -41,7 +41,7 @@ dependencies {
compile 'org.apache.lucene:lucene-queries:3.0.1' compile 'org.apache.lucene:lucene-queries:3.0.1'
compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.1' compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.1'
compile('org.jboss.netty:netty:3.1.5.GA') { transitive = false } compile('org.jboss.netty:netty:3.2.0.CR1') { transitive = false }
testCompile project(':test-testng') testCompile project(':test-testng')
testCompile('org.testng:testng:5.10:jdk15') { transitive = false } testCompile('org.testng:testng:5.10:jdk15') { transitive = false }

2
modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java
View File

@ -26,7 +26,7 @@ import org.jboss.netty.handler.codec.http.HttpRequest;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (Shay Banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ALL) @ChannelHandler.Sharable
public class HttpRequestHandler extends SimpleChannelUpstreamHandler { public class HttpRequestHandler extends SimpleChannelUpstreamHandler {
private final NettyHttpServerTransport serverTransport; private final NettyHttpServerTransport serverTransport;

2
modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java
View File

@ -154,7 +154,7 @@ public class NettyHttpChannel implements HttpChannel {
case BAD_REQUEST: case BAD_REQUEST:
return HttpResponseStatus.BAD_REQUEST; return HttpResponseStatus.BAD_REQUEST;
case UNAUTHORIZED: case UNAUTHORIZED:
return HttpResponseStatus.UNUATHORIZED; return HttpResponseStatus.UNAUTHORIZED;
case PAYMENT_REQUIRED: case PAYMENT_REQUIRED:
return HttpResponseStatus.PAYMENT_REQUIRED; return HttpResponseStatus.PAYMENT_REQUIRED;
case FORBIDDEN: case FORBIDDEN:

2
modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/OpenChannelsHandler.java
View File

@ -25,7 +25,7 @@ import org.jboss.netty.channel.*;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ALL) @ChannelHandler.Sharable
public class OpenChannelsHandler implements ChannelUpstreamHandler { public class OpenChannelsHandler implements ChannelUpstreamHandler {
private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>(); private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>();

6
modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
View File

@ -27,7 +27,10 @@ import org.elasticsearch.util.io.stream.StreamInput;
import org.elasticsearch.util.io.stream.Streamable; import org.elasticsearch.util.io.stream.Streamable;
import org.elasticsearch.util.logging.ESLogger; import org.elasticsearch.util.logging.ESLogger;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.*; import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import java.io.IOException; import java.io.IOException;
@ -36,7 +39,6 @@ import static org.elasticsearch.transport.Transport.Helper.*;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage("one")
public class MessageChannelHandler extends SimpleChannelUpstreamHandler { public class MessageChannelHandler extends SimpleChannelUpstreamHandler {
private final ESLogger logger; private final ESLogger logger;

2
modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/OpenChannelsHandler.java
View File

@ -25,7 +25,7 @@ import org.jboss.netty.channel.*;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (Shay Banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ALL) @ChannelHandler.Sharable
public class OpenChannelsHandler implements ChannelUpstreamHandler { public class OpenChannelsHandler implements ChannelUpstreamHandler {
private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>(); private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>();

2
modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/SizeHeaderFrameDecoder.java
View File

@ -22,7 +22,6 @@ package org.elasticsearch.transport.netty;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.handler.codec.frame.FrameDecoder; import org.jboss.netty.handler.codec.frame.FrameDecoder;
import java.io.StreamCorruptedException; import java.io.StreamCorruptedException;
@ -30,7 +29,6 @@ import java.io.StreamCorruptedException;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage("one")
public class SizeHeaderFrameDecoder extends FrameDecoder { public class SizeHeaderFrameDecoder extends FrameDecoder {
protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception { protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {

2
modules/elasticsearch/src/main/java/org/elasticsearch/util/concurrent/ConcurrentMaps.java
View File

@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (shay.banon)
*/ */
public abstract class ConcurrentMaps { public abstract class ConcurrentMaps {

2
plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/MemcachedDecoder.java
View File

@ -25,7 +25,6 @@ import org.elasticsearch.util.Unicode;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.handler.codec.frame.FrameDecoder; import org.jboss.netty.handler.codec.frame.FrameDecoder;
@ -35,7 +34,6 @@ import java.util.regex.Pattern;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ONE)
public class MemcachedDecoder extends FrameDecoder { public class MemcachedDecoder extends FrameDecoder {
private final Pattern lineSplit = Pattern.compile(" +"); private final Pattern lineSplit = Pattern.compile(" +");

2
plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/MemcachedDispatcher.java
View File

@ -22,14 +22,12 @@ package org.elasticsearch.memcached.netty;
import org.elasticsearch.memcached.MemcachedRestRequest; import org.elasticsearch.memcached.MemcachedRestRequest;
import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestController;
import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ONE)
public class MemcachedDispatcher extends SimpleChannelUpstreamHandler { public class MemcachedDispatcher extends SimpleChannelUpstreamHandler {
private final RestController restController; private final RestController restController;

2
plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/OpenChannelsHandler.java
View File

@ -25,7 +25,7 @@ import org.jboss.netty.channel.*;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
@ChannelPipelineCoverage(ChannelPipelineCoverage.ALL) @ChannelHandler.Sharable
public class OpenChannelsHandler implements ChannelUpstreamHandler { public class OpenChannelsHandler implements ChannelUpstreamHandler {
private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>(); private NonBlockingHashSet<Channel> openChannels = new NonBlockingHashSet<Channel>();