incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1297651 - in /incubator/lcf/trunk: ./ framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/
Date Tue, 06 Mar 2012 18:58:16 GMT
Author: kwright
Date: Tue Mar  6 18:58:15 2012
New Revision: 1297651

URL: http://svn.apache.org/viewvc?rev=1297651&view=rev
Log:
Fix for CONNECTORS-421.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
    incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
    incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDB.java
    incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDBext.java
    incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseMySQL.java
    incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BasePostgresql.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Mar  6 18:58:15 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-421: Add hooks to permit agents "process" to be reset
+by ManifoldCF.resetEnvironment().
+(Karl Wright)
+
 CONNECTORS-420: Revise the way we use Velocity so that we can make
 better use of it for internationalization purposes, and for things like loops
 etc.

Modified: incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
Tue Mar  6 18:58:15 2012
@@ -58,6 +58,17 @@ public class ManifoldCF extends org.apac
     }
   }
 
+  /** Reset the environment.
+  */
+  public static void resetEnvironment()
+    throws ManifoldCFException
+  {
+    org.apache.manifoldcf.core.system.ManifoldCF.resetEnvironment();
+    synchronized (runningHash)
+    {
+      stopAgentsRun = false;
+    }
+  }
 
   /** Install the agent tables.  This is also responsible for upgrading the existing
   * tables!!!

Modified: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
Tue Mar  6 18:58:15 2012
@@ -103,6 +103,7 @@ public class BaseDerby extends org.apach
       try
       {
         super.localCleanUp();
+        ManifoldCF.resetEnvironment();
       }
       catch (Exception e)
       {

Modified: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDB.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDB.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDB.java
Tue Mar  6 18:58:15 2012
@@ -103,6 +103,7 @@ public class BaseHSQLDB extends org.apac
       try
       {
         super.localCleanUp();
+        ManifoldCF.resetEnvironment();
       }
       catch (Exception e)
       {

Modified: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDBext.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDBext.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDBext.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseHSQLDBext.java
Tue Mar  6 18:58:15 2012
@@ -103,6 +103,7 @@ public class BaseHSQLDBext extends org.a
       try
       {
         super.localCleanUp();
+        ManifoldCF.resetEnvironment();
       }
       catch (Exception e)
       {

Modified: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseMySQL.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseMySQL.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseMySQL.java
Tue Mar  6 18:58:15 2012
@@ -103,6 +103,7 @@ public class BaseMySQL extends org.apach
       try
       {
         super.localCleanUp();
+        ManifoldCF.resetEnvironment();
       }
       catch (Exception e)
       {

Modified: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BasePostgresql.java?rev=1297651&r1=1297650&r2=1297651&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BasePostgresql.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BasePostgresql.java
Tue Mar  6 18:58:15 2012
@@ -103,6 +103,7 @@ public class BasePostgresql extends org.
       try
       {
         super.localCleanUp();
+        ManifoldCF.resetEnvironment();
       }
       catch (Exception e)
       {



Mime
View raw message