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 93B98764F for ; Thu, 15 Dec 2011 17:53:00 +0000 (UTC) Received: (qmail 67131 invoked by uid 500); 15 Dec 2011 17:53:00 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 67090 invoked by uid 500); 15 Dec 2011 17:52:59 -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 67083 invoked by uid 99); 15 Dec 2011 17:52:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Dec 2011 17:52:58 +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; Thu, 15 Dec 2011 17:52:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4E2042388A36; Thu, 15 Dec 2011 17:52:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214893 - in /incubator/lcf/trunk: loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/ loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/ tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_... Date: Thu, 15 Dec 2011 17:52:31 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111215175232.4E2042388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Thu Dec 15 17:52:31 2011 New Revision: 1214893 URL: http://svn.apache.org/viewvc?rev=1214893&view=rev Log: Repair the tests and loadtests broken by the CONNECTORS-313 commit. Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java (original) +++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseDerby.java Thu Dec 15 17:52:31 2011 @@ -294,9 +294,9 @@ public class BaseDerby extends org.apach server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java (original) +++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BaseHSQLDB.java Thu Dec 15 17:52:31 2011 @@ -294,9 +294,9 @@ public class BaseHSQLDB extends org.apac server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java (original) +++ incubator/lcf/trunk/loadtests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_loadtests/BasePostgresql.java Thu Dec 15 17:52:31 2011 @@ -294,9 +294,9 @@ public class BasePostgresql extends org. server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java (original) +++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseDerby.java Thu Dec 15 17:52:31 2011 @@ -232,9 +232,9 @@ public class BaseDerby extends org.apach server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java (original) +++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BaseHSQLDB.java Thu Dec 15 17:52:31 2011 @@ -232,9 +232,9 @@ public class BaseHSQLDB extends org.apac server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java (original) +++ incubator/lcf/trunk/loadtests/rss/src/test/java/org/apache/manifoldcf/rss_loadtests/BasePostgresql.java Thu Dec 15 17:52:31 2011 @@ -232,9 +232,9 @@ public class BasePostgresql extends org. server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java (original) +++ incubator/lcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/Base.java Thu Dec 15 17:52:31 2011 @@ -239,9 +239,9 @@ public class Base extends org.apache.man server = new Server( testPort ); server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java (original) +++ incubator/lcf/trunk/tests/cmis/src/test/java/org/apache/manifoldcf/cmis_tests/Base.java Thu Dec 15 17:52:31 2011 @@ -238,9 +238,9 @@ public class Base extends org.apache.man server = new Server( testPort ); server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java Thu Dec 15 17:52:31 2011 @@ -293,9 +293,9 @@ public class Base extends org.apache.man server = new Server( testPort ); server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseHSQLDB.java Thu Dec 15 17:52:31 2011 @@ -293,9 +293,9 @@ public class BaseHSQLDB extends org.apac server = new Server( testPort ); server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BasePostgresql.java Thu Dec 15 17:52:31 2011 @@ -294,9 +294,9 @@ public class BasePostgresql extends org. server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath"); Modified: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java?rev=1214893&r1=1214892&r2=1214893&view=diff ============================================================================== --- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java (original) +++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java Thu Dec 15 17:52:31 2011 @@ -250,9 +250,9 @@ public class BaseDerby extends org.apach server = new Server( testPort ); server.setStopAtShutdown( true ); - String crawlerWarPath = "../../framework/dist/web/war/mcf-crawler-ui.war"; - String authorityserviceWarPath = "../../framework/dist/web/war/mcf-authority-service.war"; - String apiWarPath = "../../framework/dist/web/war/mcf-api-service.war"; + String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war"; + String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war"; + String apiWarPath = "../../framework/build/war/mcf-api-service.war"; if (System.getProperty("crawlerWarPath") != null) crawlerWarPath = System.getProperty("crawlerWarPath");