From 7bafa0243c0fd860adbc9199cbd42194e3308055 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Mon, 23 Aug 2010 14:26:14 +0000 Subject: [PATCH] 323196 fix some naming issues in code ported from jetty6 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2220 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../org/eclipse/jetty/io/nio/SelectorManager.java | 12 ++++++------ .../eclipse/jetty/server/handler/DebugHandler.java | 4 ++-- .../eclipse/jetty/server/ConnectorTimeoutTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java index 0e54bff30d6..ca86630ba4b 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java @@ -44,12 +44,12 @@ import org.eclipse.jetty.util.thread.Timeout.Task; public abstract class SelectorManager extends AbstractLifeCycle { // TODO Tune these by approx system speed. - private static final int __JVMBUG_THRESHHOLD=Integer.getInteger("org.mortbay.io.nio.JVMBUG_THRESHHOLD",512).intValue(); - private static final int __MONITOR_PERIOD=Integer.getInteger("org.mortbay.io.nio.MONITOR_PERIOD",1000).intValue(); - private static final int __MAX_SELECTS=Integer.getInteger("org.mortbay.io.nio.MAX_SELECTS",25000).intValue(); - private static final int __BUSY_PAUSE=Integer.getInteger("org.mortbay.io.nio.BUSY_PAUSE",50).intValue(); - private static final int __BUSY_KEY=Integer.getInteger("org.mortbay.io.nio.BUSY_KEY",-1).intValue(); - private static final int __IDLE_TICK=Integer.getInteger("org.mortbay.io.nio.IDLE_TICK",400).intValue(); + private static final int __JVMBUG_THRESHHOLD=Integer.getInteger("org.eclipse.jetty.io.nio.JVMBUG_THRESHHOLD",512).intValue(); + private static final int __MONITOR_PERIOD=Integer.getInteger("org.eclipse.jetty.io.nio.MONITOR_PERIOD",1000).intValue(); + private static final int __MAX_SELECTS=Integer.getInteger("org.eclipse.jetty.io.nio.MAX_SELECTS",25000).intValue(); + private static final int __BUSY_PAUSE=Integer.getInteger("org.eclipse.jetty.io.nio.BUSY_PAUSE",50).intValue(); + private static final int __BUSY_KEY=Integer.getInteger("org.eclipse.jetty.io.nio.BUSY_KEY",-1).intValue(); + private static final int __IDLE_TICK=Integer.getInteger("org.eclipse.jetty.io.nio.IDLE_TICK",400).intValue(); private int _maxIdleTime; private int _lowResourcesMaxIdleTime; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java index 052b75377ae..d224474e3a8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java @@ -56,7 +56,7 @@ public class DebugHandler extends HandlerWrapper boolean suspend=false; boolean retry=false; - String name=(String)request.getAttribute("org.mortbay.jetty.thread.name"); + String name=(String)request.getAttribute("org.eclipse.jetty.thread.name"); if (name==null) name=old_name+":"+baseRequest.getScheme()+"://"+baseRequest.getLocalAddr()+":"+baseRequest.getLocalPort()+baseRequest.getUri(); else @@ -104,7 +104,7 @@ public class DebugHandler extends HandlerWrapper suspend=baseRequest.getAsyncContinuation().isSuspended(); if (suspend) { - request.setAttribute("org.mortbay.jetty.thread.name",name); + request.setAttribute("org.eclipse.jetty.thread.name",name); _print.println(d+(ms>99?".":(ms>9?".0":".00"))+ms+":"+name+" SUSPEND"); } else diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index fb58666d211..b841470bddb 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -30,7 +30,7 @@ public abstract class ConnectorTimeoutTest extends HttpServerTestFixture { static { - System.setProperty("org.mortbay.io.nio.IDLE_TICK","100"); + System.setProperty("org.eclipse.jetty.io.nio.IDLE_TICK","100"); }