Author: kwright
Date: Wed Sep 24 14:10:36 2014
New Revision: 1627326
URL: http://svn.apache.org/r1627326
Log:
Remove derby references from rss connector
Added:
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java
Removed:
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseITDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlDerbyLT.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlDerbyIT.java
Modified:
manifoldcf/branches/CONNECTORS-1044/connectors/regexpmapper/pom.xml
manifoldcf/branches/CONNECTORS-1044/connectors/rss/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1044/connectors/regexpmapper/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/regexpmapper/pom.xml?rev=1627326&r1=1627325&r2=1627326&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/connectors/regexpmapper/pom.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1044/connectors/regexpmapper/pom.xml Wed Sep
24 14:10:36 2014
@@ -241,12 +241,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/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java&r1=1627161&r2=1627326&rev=1627326&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIDerby.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BaseUIHSQLDB.java
Wed Sep 24 14:10:36 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/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java&r1=1627161&r2=1627326&rev=1627326&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyDerbyInstance.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/FlakyHSQLDBInstance.java
Wed Sep 24 14:10:36 2014
@@ -29,23 +29,25 @@ import javax.sql.*;
import java.util.concurrent.atomic.*;
/** This is a very basic sanity check */
-public class FlakyDerbyInstance extends
org.apache.manifoldcf.core.database.DBInterfaceDerby
+public class FlakyHSQLDBInstance extends
org.apache.manifoldcf.core.database.DBInterfaceHSQLDB
{
protected final static AtomicBoolean lostConnection = new
AtomicBoolean(false);
- public FlakyDerbyInstance(IThreadContext tc, String databaseName, String
userName, String password)
+ public FlakyHSQLDBInstance(IThreadContext tc, String databaseName, String
userName, String password)
throws ManifoldCFException
{
super(tc,databaseName,userName,password);
}
- public FlakyDerbyInstance(IThreadContext tc, String databaseName)
+ /*
+ public FlakyHSQLDBInstance(IThreadContext tc, String databaseName)
throws ManifoldCFException
{
super(tc,databaseName);
}
-
+ */
+
@Override
protected IResultSet execute(Connection connection, String query, List
params, boolean bResults, int maxResults,
ResultSpecification spec, ILimitChecker returnLimit)
Copied:
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java&r1=1627161&r2=1627326&rev=1627326&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java
Wed Sep 24 14:10:36 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/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java&r1=1627161&r2=1627326&rev=1627326&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyDerbyIT.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSFlakyHSQLDBIT.java
Wed Sep 24 14:10:36 2014
@@ -23,12 +23,12 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class RSSFlakyDerbyIT extends BaseITDerby
+public class RSSFlakyHSQLDBIT extends BaseITHSQLDB
{
protected RSSSimpleCrawlTester tester;
protected MockRSSService rssService = null;
- public RSSFlakyDerbyIT()
+ public RSSFlakyHSQLDBIT()
{
tester = new RSSSimpleCrawlTester(mcfInstance);
}
@@ -63,7 +63,7 @@ public class RSSFlakyDerbyIT extends Bas
protected String getDatabaseImplementationClass()
throws Exception
{
- return FlakyDerbyInstance.class.getName();
+ return FlakyHSQLDBInstance.class.getName();
}
protected static class DBInterruptionNotification implements
RSSSimpleCrawlTester.TestNotification
@@ -73,16 +73,16 @@ public class RSSFlakyDerbyIT extends Bas
{
// Wait 5 seconds, then turn of database access for 10 seconds. Then,
do it again.
Thread.sleep(5000L);
- FlakyDerbyInstance.setConnectionWorking(false);
+ FlakyHSQLDBInstance.setConnectionWorking(false);
System.out.println("Database connectivity is OFF");
Thread.sleep(10000L);
- FlakyDerbyInstance.setConnectionWorking(true);
+ FlakyHSQLDBInstance.setConnectionWorking(true);
System.out.println("Database connectivity restored");
Thread.sleep(5000L);
- FlakyDerbyInstance.setConnectionWorking(false);
+ FlakyHSQLDBInstance.setConnectionWorking(false);
System.out.println("Database connectivity is OFF");
Thread.sleep(10000L);
- FlakyDerbyInstance.setConnectionWorking(true);
+ FlakyHSQLDBInstance.setConnectionWorking(true);
System.out.println("Database connectivity restored");
}
}
Modified: manifoldcf/branches/CONNECTORS-1044/connectors/rss/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/rss/pom.xml?rev=1627326&r1=1627325&r2=1627326&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/connectors/rss/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/connectors/rss/pom.xml Wed Sep 24
14:10:36 2014
@@ -268,12 +268,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>
