Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB4899305 for ; Wed, 18 Apr 2012 22:02:12 +0000 (UTC) Received: (qmail 78235 invoked by uid 500); 18 Apr 2012 22:02:12 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 78192 invoked by uid 500); 18 Apr 2012 22:02:12 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 78185 invoked by uid 99); 18 Apr 2012 22:02:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Apr 2012 22:02:12 +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; Wed, 18 Apr 2012 22:02:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F22C4238890B; Wed, 18 Apr 2012 22:01:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1327698 - in /incubator/lcf/branches/CONNECTORS-459: framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java Date: Wed, 18 Apr 2012 22:01:48 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120418220148.F22C4238890B@eris.apache.org> Author: kwright Date: Wed Apr 18 22:01:48 2012 New Revision: 1327698 URL: http://svn.apache.org/viewvc?rev=1327698&view=rev Log: Fix a couple of outstanding problems. Modified: incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java Modified: incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1327698&r1=1327697&r2=1327698&view=diff ============================================================================== --- incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java (original) +++ incubator/lcf/branches/CONNECTORS-459/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java Wed Apr 18 22:01:48 2012 @@ -33,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.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; /** * Run ManifoldCF with jetty. Modified: incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java?rev=1327698&r1=1327697&r2=1327698&view=diff ============================================================================== --- incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java (original) +++ incubator/lcf/branches/CONNECTORS-459/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/CMISServer.java Wed Apr 18 22:01:48 2012 @@ -27,7 +27,8 @@ import org.eclipse.jetty.webapp.WebAppCo public class CMISServer { protected Server cmisServer = null; - + protected WebAppContext openCmisServerApi = null; + public CMISServer(int port, String warPath) { cmisServer = new Server(port); @@ -37,7 +38,7 @@ public class CMISServer ContextHandlerCollection contexts = new ContextHandlerCollection(); cmisServer.setHandler(contexts); - WebAppContext openCmisServerApi = new WebAppContext(warPath,"/chemistry-opencmis-server-inmemory"); + openCmisServerApi = new WebAppContext(warPath,"/chemistry-opencmis-server-inmemory"); openCmisServerApi.setParentLoaderPriority(false); contexts.addHandler(openCmisServerApi); }