Repository: samza Updated Branches: refs/heads/master 1e5f30f38 -> 3cde990d0
SAMZA-1048 : upgrade jetty dependency to Jetty 9 from Jetty 8 Jetty 8 is a very old jetty version and the current widely used version is Jetty 9. If a user is using standalone Samza in a Jetty container, and he/she is using Jetty 9, he/she may see some incompatibility issue and it makes a lot of sense for a user to upgrade the Jetty version on his/her side instead of downgrading the Jetty version. Author: Fred Ji <[email protected]> Reviewers: Yi Pan <[email protected]> Closes #20 from fredji97/master Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/3cde990d Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/3cde990d Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/3cde990d Branch: refs/heads/master Commit: 3cde990d02d8db70b3396ad8b722cd5441775846 Parents: 1e5f30f Author: Fred Ji <[email protected]> Authored: Tue Nov 29 16:17:37 2016 -0800 Committer: Yi Pan (Data Infrastructure) <[email protected]> Committed: Tue Nov 29 16:17:37 2016 -0800 ---------------------------------------------------------------------- gradle/dependency-versions-scala-2.10.gradle | 2 +- .../scala/org/apache/samza/coordinator/server/HttpServer.scala | 4 ++-- .../src/main/java/org/apache/samza/rest/SamzaRestService.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/3cde990d/gradle/dependency-versions-scala-2.10.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.10.gradle b/gradle/dependency-versions-scala-2.10.gradle index f12beaf..698cfbc 100644 --- a/gradle/dependency-versions-scala-2.10.gradle +++ b/gradle/dependency-versions-scala-2.10.gradle @@ -25,5 +25,5 @@ ext { // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" scalatraVersion = "2.2.1" - jettyVersion = "8.1.8.v20121106" + jettyVersion = "9.2.7.v20150116" } http://git-wip-us.apache.org/repos/asf/samza/blob/3cde990d/samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala b/samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala index 06ca773..3849722 100644 --- a/samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala +++ b/samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala @@ -21,7 +21,7 @@ package org.apache.samza.coordinator.server; import javax.servlet.Servlet import org.apache.samza.SamzaException -import org.eclipse.jetty.server.Connector +import org.eclipse.jetty.server.NetworkConnector import org.eclipse.jetty.server.Server import org.eclipse.jetty.servlet.DefaultServlet import org.eclipse.jetty.servlet.ServletContextHandler @@ -129,7 +129,7 @@ class HttpServer( */ def getUrl = { if (running) { - val runningPort = server.getConnectors()(0).asInstanceOf[Connector].getLocalPort() + val runningPort = server.getConnectors()(0).asInstanceOf[NetworkConnector].getLocalPort() new URL("http://"; + Util.getLocalHost.getHostName + ":" + runningPort + rootPath) } else { http://git-wip-us.apache.org/repos/asf/samza/blob/3cde990d/samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java ---------------------------------------------------------------------- diff --git a/samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java b/samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java index f3c482f..de6febb 100644 --- a/samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java +++ b/samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java @@ -30,6 +30,7 @@ import org.apache.samza.monitor.ScheduledExecutorSchedulingProvider; import org.apache.samza.util.CommandLine; import org.apache.samza.util.MetricsReporterLoader; import org.apache.samza.util.Util; +import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -165,7 +166,7 @@ public class SamzaRestService { log.info("Starting the metrics reporter : {}.", reporterName); metricsReporter.start(); }); - log.info("Starting server on port {}", server.getConnectors()[0].getPort()); + log.info("Starting server on port {}", ((NetworkConnector) server.getConnectors()[0]).getPort()); server.start(); log.info("Server is running"); }
