Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2012-08-03 16:35:34 +0000
committerSimone Bordet2012-08-03 16:35:34 +0000
commite3132d41d8260915ca79c622f6b720a62dbbc635 (patch)
treee233aef842e74eee0d38cce187a7cf4e64715e90 /jetty-deploy/src
parent2d7b6c9c06f7e7ee73a2cb9ec8ae3b0e94adac2c (diff)
downloadorg.eclipse.jetty.project-e3132d41d8260915ca79c622f6b720a62dbbc635.tar.gz
org.eclipse.jetty.project-e3132d41d8260915ca79c622f6b720a62dbbc635.tar.xz
org.eclipse.jetty.project-e3132d41d8260915ca79c622f6b720a62dbbc635.zip
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
This change abstracts out the connection creation from the connector itself, so there can be only one connector managing all protocols, depending on the configuration of the connection factories.
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index 395805c151..9b8abcc23d 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -36,6 +36,7 @@ import org.eclipse.jetty.deploy.DeploymentManager;
import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
@@ -65,7 +66,7 @@ public class XmlConfiguredJetty
Properties properties = new Properties();
String jettyHomeBase = testdir.getDir().getAbsolutePath();
- // Ensure we have a new (pristene) directory to work with.
+ // Ensure we have a new (pristene) directory to work with.
int idx = 0;
_jettyHome = new File(jettyHomeBase + "#" + idx);
while (_jettyHome.exists())
@@ -412,9 +413,9 @@ public class XmlConfiguredJetty
Connector connectors[] = _server.getConnectors();
for (int i = 0; _serverPort<0 && i < connectors.length; i++)
{
- if (connectors[i] instanceof Connector.NetConnector)
+ if (connectors[i] instanceof NetworkConnector)
{
- int port = ((Connector.NetConnector)connectors[i]).getLocalPort();
+ int port = ((NetworkConnector)connectors[i]).getLocalPort();
if (port>0)
_serverPort=port;
}

Back to the top