Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82F3217FC0 for ; Mon, 29 Sep 2014 14:58:35 +0000 (UTC) Received: (qmail 63881 invoked by uid 500); 29 Sep 2014 14:58:35 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 63837 invoked by uid 500); 29 Sep 2014 14:58:35 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 63828 invoked by uid 99); 29 Sep 2014 14:58:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 14:58:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 14:58:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C2C7323889F1; Mon, 29 Sep 2014 14:58:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1628199 - in /manifoldcf/branches/CONNECTORS-1050: ./ connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/ connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/ connec... Date: Mon, 29 Sep 2014 14:58:05 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140929145806.C2C7323889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Mon Sep 29 14:58:04 2014 New Revision: 1628199 URL: http://svn.apache.org/r1628199 Log: Commit the patch as proposed by Abe-san Modified: manifoldcf/branches/CONNECTORS-1050/build.xml manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/build.xml manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml manifoldcf/branches/CONNECTORS-1050/framework/core/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/crawler-ui/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml manifoldcf/branches/CONNECTORS-1050/pom.xml Modified: manifoldcf/branches/CONNECTORS-1050/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/build.xml Mon Sep 29 14:58:04 2014 @@ -30,7 +30,7 @@ - + @@ -949,8 +949,8 @@ Use Apache Forrest version forrest-0.9-d - - + + @@ -1215,9 +1215,9 @@ Use Apache Forrest version forrest-0.9-d - - - + + + Modified: manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java (original) +++ manifoldcf/branches/CONNECTORS-1050/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/MockRSSService.java Mon Sep 29 14:58:04 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -39,8 +39,10 @@ public class MockRSSService public MockRSSService(int docsPerFeed) { - server = new Server(8189); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8189); + server.addConnector(connector); servlet = new RSSServlet(docsPerFeed); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/rss"); Modified: manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java (original) +++ manifoldcf/branches/CONNECTORS-1050/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/MockSolrService.java Mon Sep 29 14:58:04 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.agents.out import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -39,8 +39,10 @@ public class MockSolrService public MockSolrService() { - server = new Server(8188); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8188); + server.addConnector(connector); servlet = new SolrServlet(); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none"); Modified: manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java (original) +++ manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockSessionWebService.java Mon Sep 29 14:58:04 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -39,8 +40,10 @@ public class MockSessionWebService public MockSessionWebService(int numContentDocs, String userName, String password) { - server = new Server(8191); - server.setThreadPool(new QueuedThreadPool(100)); + server = new Server(new QueuedThreadPool(100)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8191); + server.addConnector(connector); servlet = new SessionWebServlet(numContentDocs,userName,password); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setInitParameter("org.eclipse.jetty.servlet.SessionIdPathParameterName","none"); Modified: manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java (original) +++ manifoldcf/branches/CONNECTORS-1050/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/MockWebService.java Mon Sep 29 14:58:04 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -27,7 +28,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.*; import java.util.*; @@ -44,8 +44,10 @@ public class MockWebService public MockWebService(int docsPerLevel, int maxLevels, boolean generateBadPages) { - server = new Server(8191); - server.setThreadPool(new QueuedThreadPool(100)); + server = new Server(new QueuedThreadPool(100)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8191); + server.addConnector(connector); servlet = new WebServlet(docsPerLevel, maxLevels, generateBadPages); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/web"); Modified: manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java (original) +++ manifoldcf/branches/CONNECTORS-1050/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/MockWikiService.java Mon Sep 29 14:58:04 2014 @@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -38,8 +39,10 @@ public class MockWikiService public MockWikiService(Class theResourceClass) { - server = new Server(8089); - server.setThreadPool(new QueuedThreadPool(35)); + server = new Server(new QueuedThreadPool(35)); + ServerConnector connector = new ServerConnector(server); + connector.setPort(8089); + server.addConnector(connector); servlet = new WikiAPIServlet(theResourceClass); ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); context.setContextPath("/w"); Modified: manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/api-service/pom.xml Mon Sep 29 14:58:04 2014 @@ -54,7 +54,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} provided @@ -96,4 +96,4 @@ - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/api-servlet/pom.xml Mon Sep 29 14:58:04 2014 @@ -54,9 +54,9 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/authority-service/pom.xml Mon Sep 29 14:58:04 2014 @@ -54,7 +54,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} provided @@ -97,4 +97,4 @@ - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/authority-servlet/pom.xml Mon Sep 29 14:58:04 2014 @@ -49,9 +49,9 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} provided - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/build.xml Mon Sep 29 14:58:04 2014 @@ -63,7 +63,7 @@ - + @@ -886,7 +886,7 @@ - + @@ -896,7 +896,7 @@ - + @@ -1089,7 +1089,7 @@ - + Modified: manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/buildfiles/connector-build.xml Mon Sep 29 14:58:04 2014 @@ -132,7 +132,7 @@ - + Modified: manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/combined-service/pom.xml Mon Sep 29 14:58:04 2014 @@ -71,7 +71,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} provided @@ -153,4 +153,4 @@ - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/combined-service/src/main/webapp/WEB-INF/web.xml Mon Sep 29 14:58:04 2014 @@ -1,9 +1,5 @@ - - javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} provided @@ -121,4 +121,4 @@ - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/pom.xml Mon Sep 29 14:58:04 2014 @@ -205,7 +205,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} @@ -381,4 +381,4 @@ - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFCombinedJettyRunner.java Mon Sep 29 14:58:04 2014 @@ -18,6 +18,7 @@ package org.apache.manifoldcf.jettyrunner; import java.io.*; + import org.apache.manifoldcf.core.interfaces.*; import org.apache.manifoldcf.crawler.system.*; import org.apache.manifoldcf.crawler.*; @@ -32,6 +33,7 @@ import javax.servlet.http.HttpServletRes import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.server.Connector; @@ -109,7 +111,7 @@ public class ManifoldCFCombinedJettyRunn public int getLocalPort() throws ManifoldCFException { - Connector[] conns = server.getConnectors(); + ServerConnector[] conns = (ServerConnector[]) server.getConnectors(); if (0 == conns.length) { throw new ManifoldCFException("Jetty Server has no Connectors"); } Modified: manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java Mon Sep 29 14:58:04 2014 @@ -18,6 +18,7 @@ package org.apache.manifoldcf.jettyrunner; import java.io.*; + import org.apache.manifoldcf.core.interfaces.*; import org.apache.manifoldcf.crawler.system.*; import org.apache.manifoldcf.crawler.*; @@ -33,6 +34,7 @@ import javax.servlet.http.HttpServletRes import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.server.Connector; @@ -125,7 +127,7 @@ public class ManifoldCFJettyRunner public int getLocalPort() throws ManifoldCFException { - Connector[] conns = server.getConnectors(); + ServerConnector[] conns = (ServerConnector[]) server.getConnectors(); if (0 == conns.length) { throw new ManifoldCFException("Jetty Server has no Connectors"); } Modified: manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/framework/ui-core/pom.xml Mon Sep 29 14:58:04 2014 @@ -68,6 +68,17 @@ ${project.version} + + org.mortbay.jetty + jsp-api-2.1-glassfish + ${glassfish.version} + + + org.mortbay.jetty + jsp-2.1-glassfish + ${glassfish.version} + + commons-lang @@ -90,4 +101,4 @@ ${velocity.version} - \ No newline at end of file + Modified: manifoldcf/branches/CONNECTORS-1050/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1050/pom.xml?rev=1628199&r1=1628198&r2=1628199&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1050/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1050/pom.xml Mon Sep 29 14:58:04 2014 @@ -41,7 +41,7 @@ 9.1-901.jdbc4 5.1.18 2.3.1 - 7.5.4.v20111024 + 9.2.3.v20140905 1.4.5 1.1.1 1.4 @@ -64,7 +64,7 @@ 2.10.0 1.4.01 1.2.4 - 2.5 + 3.1.0 1.2 2.1.v20091210 1.2.16