Remove derby dependency from solr
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1044@1627327 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/sharepoint/pom.xml b/connectors/sharepoint/pom.xml
index 73f10ca..2aafffa 100644
--- a/connectors/sharepoint/pom.xml
+++ b/connectors/sharepoint/pom.xml
@@ -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>
diff --git a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java
deleted file mode 100644
index 350c61c..0000000
--- a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITDerby.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $Id$ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.manifoldcf.agents.output.solr.tests;
-
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ManifoldCF;
-
-import java.io.*;
-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
-{
- protected String[] getConnectorNames()
- {
- return new String[]{"Test Connector"};
- }
-
- protected String[] getConnectorClasses()
- {
- return new String[]{"org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector"};
- }
-
- protected String[] getOutputNames()
- {
- return new String[]{"Solr Output"};
- }
-
- protected String[] getOutputClasses()
- {
- return new String[]{"org.apache.manifoldcf.agents.output.solr.SolrConnector"};
- }
-}
diff --git a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java
similarity index 94%
rename from connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java
rename to connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java
index c901570..b6744c2 100644
--- a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java
+++ b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseITHSQLDB.java
@@ -28,7 +28,7 @@
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 BaseITHSQLDB extends org.apache.manifoldcf.crawler.tests.BaseITHSQLDB
{
protected String[] getConnectorNames()
{
@@ -49,5 +49,4 @@
{
return new String[]{"org.apache.manifoldcf.agents.output.solr.SolrConnector"};
}
-
}
diff --git a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java
similarity index 94%
copy from connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java
copy to connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java
index c901570..53041d7 100644
--- a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIDerby.java
+++ b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/BaseUIHSQLDB.java
@@ -28,7 +28,7 @@
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()
{
diff --git a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java
similarity index 99%
rename from connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
rename to connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java
index b27aad8..af98814 100644
--- a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
+++ b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java
@@ -30,7 +30,7 @@
import org.apache.manifoldcf.core.tests.HTMLTester;
/** Basic UI navigation tests */
-public class NavigationDerbyUI extends BaseUIDerby
+public class NavigationHSQLDBUI extends BaseUIHSQLDB
{
@Test
diff --git a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java
similarity index 94%
rename from connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java
rename to connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java
index 173411b..aeec952 100644
--- a/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlDerbyIT.java
+++ b/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrCrawlHSQLDBIT.java
@@ -23,13 +23,13 @@
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);
}
diff --git a/connectors/solr/pom.xml b/connectors/solr/pom.xml
index a896347..fdf98fa 100644
--- a/connectors/solr/pom.xml
+++ b/connectors/solr/pom.xml
@@ -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>
