Repository: activemq Updated Branches: refs/heads/trunk f4eade2bb -> 3ec36818e
Get more tests passing with Jetty9 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3ec36818 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3ec36818 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3ec36818 Branch: refs/heads/trunk Commit: 3ec36818eb440037ec0e351c656e7f1168bc44a6 Parents: f4eade2 Author: Daniel Kulp <[email protected]> Authored: Thu Jan 15 12:16:17 2015 -0500 Committer: Daniel Kulp <[email protected]> Committed: Thu Jan 15 12:16:17 2015 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/util/HttpTestSupport.java | 14 ++++++-------- activemq-web/pom.xml | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/3ec36818/activemq-fileserver/src/test/java/org/apache/activemq/util/HttpTestSupport.java ---------------------------------------------------------------------- diff --git a/activemq-fileserver/src/test/java/org/apache/activemq/util/HttpTestSupport.java b/activemq-fileserver/src/test/java/org/apache/activemq/util/HttpTestSupport.java index 4f48843..6ea0a25 100644 --- a/activemq-fileserver/src/test/java/org/apache/activemq/util/HttpTestSupport.java +++ b/activemq-fileserver/src/test/java/org/apache/activemq/util/HttpTestSupport.java @@ -52,25 +52,23 @@ public abstract class HttpTestSupport extends TestCase { final File homeDir = new File("src/main/webapp/uploads/"); + + private int getPort(Object o) throws Exception { + return (Integer)o.getClass().getMethod("getLocalPort").invoke(o); + } @Override protected void setUp() throws Exception { - server = new Server(); - SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(0); - connector.setServer(server); + server = new Server(0); WebAppContext context = new WebAppContext(); context.setResourceBase("src/main/webapp"); context.setContextPath("/"); context.setServer(server); server.setHandler(context); - server.setConnectors(new Connector[] { - connector - }); server.start(); - int port = connector.getLocalPort(); + int port = getPort(server.getConnectors()[0]); waitForJettySocketToAccept("http://localhost:"; + port); http://git-wip-us.apache.org/repos/asf/activemq/blob/3ec36818/activemq-web/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index 4b38f78..8417b58 100755 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -81,7 +81,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId>
