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 5297511640 for ; Wed, 24 Sep 2014 14:16:50 +0000 (UTC) Received: (qmail 57358 invoked by uid 500); 24 Sep 2014 14:16:50 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 57308 invoked by uid 500); 24 Sep 2014 14:16:50 -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 57299 invoked by uid 99); 24 Sep 2014 14:16:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Sep 2014 14:16:50 +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, 24 Sep 2014 14:16:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 65F1323888E2; Wed, 24 Sep 2014 14:16:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1627327 - in /manifoldcf/branches/CONNECTORS-1044/connectors: sharepoint/ solr/ solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/ Date: Wed, 24 Sep 2014 14:16:28 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140924141628.65F1323888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Wed Sep 24 14:16:27 2014 New Revision: 1627327 URL: http://svn.apache.org/r1627327 Log: Remove derby dependency from solr Added: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java - copied, changed from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java - copied, changed from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java - copied, changed from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java - copied, changed from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java Removed: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java Modified: manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint/pom.xml manifoldcf/branches/CONNECTORS-1044/connectors/solr/pom.xml Modified: manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint/pom.xml?rev=1627327&r1=1627326&r2=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/sharepoint/pom.xml Wed Sep 24 14:16:27 2014 @@ -346,12 +346,6 @@ test - org.apache.derby - derby - ${derby.version} - test - - mysql mysql-connector-java ${mysql.version} Copied: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java (from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java&r1=1627161&r2=1627327&rev=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java Wed Sep 24 14:16:27 2014 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** Tests that run the "agents daemon" should be derived from this */ -public class BaseITDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby +public class BaseITHSQLDB extends org.apache.manifoldcf.crawler.tests.BaseITHSQLDB { protected String[] getConnectorNames() { Copied: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java (from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java&r1=1627161&r2=1627327&rev=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java Wed Sep 24 14:16:27 2014 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** Tests that run the "agents daemon" should be derived from this */ -public class BaseUIDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIDerby +public class BaseUIHSQLDB extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIHSQLDB { protected String[] getConnectorNames() { Copied: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java (from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java&r1=1627161&r2=1627327&rev=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java Wed Sep 24 14:16:27 2014 @@ -30,7 +30,7 @@ import org.junit.*; import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ -public class NavigationDerbyUI extends BaseUIDerby +public class NavigationHSQLDBUI extends BaseUIHSQLDB { @Test Copied: manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java (from r1627161, manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java&r1=1627161&r2=1627327&rev=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java Wed Sep 24 14:16:27 2014 @@ -23,13 +23,13 @@ import java.util.*; import org.junit.*; /** This is a very basic sanity check */ -public class SolrCrawlDerbyIT extends BaseITDerby +public class SolrCrawlHSQLDBIT extends BaseITHSQLDB { protected SolrTester tester; protected MockSolrService solrService = null; - public SolrCrawlDerbyIT() + public SolrCrawlHSQLDBIT() { tester = new SolrTester(mcfInstance); } Modified: manifoldcf/branches/CONNECTORS-1044/connectors/solr/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/solr/pom.xml?rev=1627327&r1=1627326&r2=1627327&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1044/connectors/solr/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1044/connectors/solr/pom.xml Wed Sep 24 14:16:27 2014 @@ -265,12 +265,6 @@ test - org.apache.derby - derby - ${derby.version} - test - - mysql mysql-connector-java ${mysql.version}