From a254bf41e747649f311844ce2475889fd349e215 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 9 Dec 2011 13:59:41 +0900 Subject: [PATCH] Fewer JBoss reference --- src/main/java/io/netty/bootstrap/package-info.java | 2 +- src/main/java/io/netty/channel/Channel.java | 2 +- .../java/io/netty/channel/ChannelDownstreamHandler.java | 2 +- src/main/java/io/netty/channel/ChannelFactory.java | 2 +- src/main/java/io/netty/channel/ChannelHandler.java | 2 +- .../java/io/netty/channel/ChannelUpstreamHandler.java | 2 +- src/main/java/io/netty/channel/package-info.java | 4 ++-- src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java | 2 +- .../io/netty/example/http/upload/HttpRequestHandler.java | 8 -------- .../java/io/netty/util/internal/StackTraceSimplifier.java | 2 +- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/netty/bootstrap/package-info.java b/src/main/java/io/netty/bootstrap/package-info.java index b2d18d0831..a8476aa23c 100644 --- a/src/main/java/io/netty/bootstrap/package-info.java +++ b/src/main/java/io/netty/bootstrap/package-info.java @@ -19,6 +19,6 @@ * typical client side and server side channel initialization. * * @apiviz.landmark - * @apiviz.exclude ^org\.jboss\.netty\.util\. + * @apiviz.exclude ^io\.netty\.util\. */ package io.netty.bootstrap; diff --git a/src/main/java/io/netty/channel/Channel.java b/src/main/java/io/netty/channel/Channel.java index 246f6ce7de..c764573bf6 100644 --- a/src/main/java/io/netty/channel/Channel.java +++ b/src/main/java/io/netty/channel/Channel.java @@ -103,7 +103,7 @@ import io.netty.channel.socket.nio.NioSocketChannelConfig; * @apiviz.composedOf io.netty.channel.ChannelConfig * @apiviz.composedOf io.netty.channel.ChannelPipeline * - * @apiviz.exclude ^org\.jboss\.netty\.channel\.([a-z]+\.)+[^\.]+Channel$ + * @apiviz.exclude ^io\.netty\.channel\.([a-z]+\.)+[^\.]+Channel$ */ public interface Channel extends Comparable { diff --git a/src/main/java/io/netty/channel/ChannelDownstreamHandler.java b/src/main/java/io/netty/channel/ChannelDownstreamHandler.java index b8926d583a..924487a4f7 100644 --- a/src/main/java/io/netty/channel/ChannelDownstreamHandler.java +++ b/src/main/java/io/netty/channel/ChannelDownstreamHandler.java @@ -67,7 +67,7 @@ package io.netty.channel; * may be invoked by more than one thread simultaneously. If the handler * accesses a shared resource or stores stateful information, you might need * proper synchronization in the handler implementation. - * @apiviz.exclude ^org\.jboss\.netty\.handler\..*$ + * @apiviz.exclude ^io\.netty\.handler\..*$ */ public interface ChannelDownstreamHandler extends ChannelHandler { diff --git a/src/main/java/io/netty/channel/ChannelFactory.java b/src/main/java/io/netty/channel/ChannelFactory.java index 2cef4cdad8..b24add543b 100644 --- a/src/main/java/io/netty/channel/ChannelFactory.java +++ b/src/main/java/io/netty/channel/ChannelFactory.java @@ -49,7 +49,7 @@ import io.netty.util.ExternalResourceReleasable; * @apiviz.landmark * @apiviz.has io.netty.channel.Channel oneway - - creates * - * @apiviz.exclude ^org\.jboss\.netty\.channel\.([a-z]+\.)+.*ChannelFactory$ + * @apiviz.exclude ^io\.netty\.channel\.([a-z]+\.)+.*ChannelFactory$ */ public interface ChannelFactory extends ExternalResourceReleasable { diff --git a/src/main/java/io/netty/channel/ChannelHandler.java b/src/main/java/io/netty/channel/ChannelHandler.java index 3995c7e7e6..a906cbb5e4 100644 --- a/src/main/java/io/netty/channel/ChannelHandler.java +++ b/src/main/java/io/netty/channel/ChannelHandler.java @@ -203,7 +203,7 @@ import io.netty.channel.group.ChannelGroup; * out what a upstream event and a downstream event are, what fundamental * differences they have, and how they flow in a pipeline. * @apiviz.landmark - * @apiviz.exclude ^org\.jboss\.netty\.handler\..*$ + * @apiviz.exclude ^io\.netty\.handler\..*$ */ public interface ChannelHandler { diff --git a/src/main/java/io/netty/channel/ChannelUpstreamHandler.java b/src/main/java/io/netty/channel/ChannelUpstreamHandler.java index 31d9e43753..000e413456 100644 --- a/src/main/java/io/netty/channel/ChannelUpstreamHandler.java +++ b/src/main/java/io/netty/channel/ChannelUpstreamHandler.java @@ -83,7 +83,7 @@ import io.netty.handler.execution.ExecutionHandler; * this behavior changes depending on what {@link Executor} was employed to * dispatch the events. Please refer to {@link ExecutionHandler} for more * information. - * @apiviz.exclude ^org\.jboss\.netty\.handler\..*$ + * @apiviz.exclude ^io\.netty\.handler\..*$ */ public interface ChannelUpstreamHandler extends ChannelHandler { diff --git a/src/main/java/io/netty/channel/package-info.java b/src/main/java/io/netty/channel/package-info.java index 0b646dac35..8b6dcbf7b6 100644 --- a/src/main/java/io/netty/channel/package-info.java +++ b/src/main/java/io/netty/channel/package-info.java @@ -21,8 +21,8 @@ * * @apiviz.landmark * @apiviz.exclude ^java - * @apiviz.exclude ^org\.jboss\.netty\.channel\.[^\.]+\. - * @apiviz.exclude ^org\.jboss\.netty\.(bootstrap|handler|util)\. + * @apiviz.exclude ^io\.netty\.channel\.[^\.]+\. + * @apiviz.exclude ^io\.netty\.(bootstrap|handler|util)\. * @apiviz.exclude \.(Abstract|Default|Static).*$ * @apiviz.exclude \.(Downstream|Upstream).*Event$ * @apiviz.exclude \.[A-Za-z]+ChannelFuture$ diff --git a/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java b/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java index e412a78948..71018a22fc 100644 --- a/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java +++ b/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java @@ -46,7 +46,7 @@ import io.netty.channel.MessageEvent; import io.netty.channel.UpstreamMessageEvent; /** - * A {@link ChannelSink} implementation of the RXTX support for JBoss Netty. + * A {@link ChannelSink} implementation of the RXTX support for Netty. */ public class RXTXChannelSink extends AbstractChannelSink { diff --git a/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java b/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java index 305568a536..f6e0b529e2 100644 --- a/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java +++ b/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java @@ -84,14 +84,6 @@ public class HttpRequestHandler extends SimpleChannelUpstreamHandler { DiskAttribute.baseDirectory = null; // system temp directory } - /* - * (non-Javadoc) - * - * @see - * io.netty.channel.SimpleChannelUpstreamHandler#channelClosed(org - * .jboss.netty.channel.ChannelHandlerContext, - * io.netty.channel.ChannelStateEvent) - */ @Override public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { diff --git a/src/main/java/io/netty/util/internal/StackTraceSimplifier.java b/src/main/java/io/netty/util/internal/StackTraceSimplifier.java index 10a224bdae..4c55c8a1f1 100644 --- a/src/main/java/io/netty/util/internal/StackTraceSimplifier.java +++ b/src/main/java/io/netty/util/internal/StackTraceSimplifier.java @@ -34,7 +34,7 @@ public class StackTraceSimplifier { private static final boolean SIMPLIFY_STACK_TRACE = !DebugUtil.isDebugEnabled(); private static final Pattern EXCLUDED_STACK_TRACE = Pattern.compile( - "^org\\.jboss\\.netty\\." + + "^io\\.netty\\." + "(util\\.internal\\.DeadLockProofWorker" + "|channel\\.(SimpleChannel(Upstream|Downstream)?Handler|(Default|Static)ChannelPipeline.*))(\\$.*)?$");