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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
