incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1225740 [3/3] - in /incubator/lcf/trunk: ./ framework/pull-agent/ framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/ tests/cmis/src/test/java/org/apach...
Date Fri, 30 Dec 2011 03:15:14 GMT
Modified: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java?rev=1225740&r1=1225739&r2=1225740&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java
(original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BaseMySQL.java
Fri Dec 30 03:15:14 2011
@@ -27,26 +27,9 @@ import java.io.*;
 import java.util.*;
 import org.junit.*;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.log.Logger;
-
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-
 /** Tests that run the "agents daemon" should be derived from this */
-public class BaseMySQL extends org.apache.manifoldcf.crawler.tests.ConnectorBaseMySQL
+public class BaseMySQL extends org.apache.manifoldcf.crawler.tests.BaseITMySQL
 {
-  public static final String agentShutdownSignal = "agent-process";
-  public static final int testPort = 8346;
-  
-  protected DaemonThread daemonThread = null;
-  protected Server server = null;
-
   protected String[] getConnectorNames()
   {
     return new String[]{"File Connector"};
@@ -67,395 +50,4 @@ public class BaseMySQL extends org.apach
     return new String[]{"org.apache.manifoldcf.agents.output.nullconnector.NullConnector"};
   }
   
-  // API support
-  
-  // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated
jetty
-  
-  /** Construct a command url.
-  */
-  protected String makeAPIURL(String command)
-  {
-    return "http://localhost:"+Integer.toString(testPort)+"/mcf-api-service/json/"+command;
-  }
-  
-  /** Perform an json API GET operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIGetOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    GetMethod method = new GetMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API DELETE operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIDeleteOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    DeleteMethod method = new DeleteMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API PUT operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPutOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PutMethod method = new PutMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API POST operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPostOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PostMethod method = new PostMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform a json GET API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIGetOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIGetOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json DELETE API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIDeleteOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIDeleteOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json PUT API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPutOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPutOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json POST API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPostOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPostOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  // Setup/teardown
-  
-  @Before
-  public void setUp()
-    throws Exception
-  {
-    super.setUp();
-    // Start jetty
-    server = new Server( testPort );    
-    server.setStopAtShutdown( true );
-
-    
-    String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
-    String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
-    String apiWarPath = "../../framework/build/war/mcf-api-service.war";
-
-    if (System.getProperty("crawlerWarPath") != null)
-    	crawlerWarPath = System.getProperty("crawlerWarPath");
-    if (System.getProperty("authorityserviceWarPath") != null)
-    	authorityserviceWarPath = System.getProperty("authorityserviceWarPath");
-    if (System.getProperty("apiWarPath") != null)
-    	apiWarPath = System.getProperty("apiWarPath");
-    
-    // Initialize the servlets
-    WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfCrawlerUI.setParentLoaderPriority(true);
-    server.addHandler(lcfCrawlerUI);
-    WebAppContext lcfAuthorityService = new WebAppContext(authorityserviceWarPath,"/mcf-authority-service");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfAuthorityService.setParentLoaderPriority(true);
-    server.addHandler(lcfAuthorityService);
-    WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
-    lcfApi.setParentLoaderPriority(true);
-    server.addHandler(lcfApi);
-    server.start();
-
-    // If all worked, then we can start the daemon.
-    // Clear the agents shutdown signal.
-    IThreadContext tc = ThreadContextFactory.make();
-    ILockManager lockManager = LockManagerFactory.make(tc);
-    lockManager.clearGlobalFlag(agentShutdownSignal);
-
-    daemonThread = new DaemonThread();
-    daemonThread.start();
-  }
-  
-  @After
-  public void cleanUp()
-    throws Exception
-  {
-    initialize();
-    if (isInitialized())
-    {
-      Exception currentException = null;
-      IThreadContext tc = ThreadContextFactory.make();
-
-      // Delete all jobs (and wait for them to go away)
-      if (daemonThread != null)
-      {
-        IJobManager jobManager = JobManagerFactory.make(tc);
-        
-        // Get a list of the current active jobs
-        IJobDescription[] jobs = jobManager.getAllJobs();
-        int i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Abort this job, if it is running
-          try
-          {
-            jobManager.manualAbort(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This generally means that the job was not running
-          }
-        }
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to stop
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              int statusValue = status.getStatus();
-              switch (statusValue)
-              {
-              case JobStatus.JOBSTATUS_NOTYETRUN:
-              case JobStatus.JOBSTATUS_COMPLETED:
-              case JobStatus.JOBSTATUS_ERROR:
-                break;
-              default:
-                ManifoldCF.sleep(10000);
-                continue;
-              }
-            }
-            break;
-          }
-        }
-
-        // Now, delete them all
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          try
-          {
-            jobManager.deleteJob(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This usually means that the job is already being deleted
-          }
-        }
-
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to disappear
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              ManifoldCF.sleep(10000);
-              continue;
-            }
-            break;
-          }
-        }
-
-        // Shut down daemon
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        lockManager.setGlobalFlag(agentShutdownSignal);
-      
-        // Wait for daemon thread to exit.
-        while (true)
-        {
-          if (daemonThread.isAlive())
-          {
-            Thread.sleep(1000L);
-            continue;
-          }
-          break;
-        }
-
-        Exception e = daemonThread.getDaemonException();
-        if (e != null)
-          currentException = e;
-      }
-      
-      if (server != null)
-      {
-        server.stop();
-        server.join();
-        server = null;
-      }
-      
-      // Clean up everything else
-      try
-      {
-        super.cleanUp();
-      }
-      catch (Exception e)
-      {
-        if (currentException == null)
-          currentException = e;
-      }
-      if (currentException != null)
-        throw currentException;
-    }
-  }
-  
-  protected static class DaemonThread extends Thread
-  {
-    protected Exception daemonException = null;
-    
-    public DaemonThread()
-    {
-      setName("Daemon thread");
-    }
-    
-    public void run()
-    {
-      IThreadContext tc = ThreadContextFactory.make();
-      // Now, start the server, and then wait for the shutdown signal.  On shutdown, we have
to actually do the cleanup,
-      // because the JVM isn't going away.
-      try
-      {
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        while (true)
-        {
-          // Any shutdown signal yet?
-          if (lockManager.checkGlobalFlag(agentShutdownSignal))
-            break;
-            
-          // Start whatever agents need to be started
-          ManifoldCF.startAgents(tc);
-
-          try
-          {
-            ManifoldCF.sleep(5000);
-          }
-          catch (InterruptedException e)
-          {
-            break;
-          }
-        }
-      }
-      catch (ManifoldCFException e)
-      {
-        daemonException = e;
-      }
-      finally
-      {
-        try
-        {
-          ManifoldCF.stopAgents(tc);
-        }
-        catch (ManifoldCFException e)
-        {
-          daemonException = e;
-        }
-      }
-    }
-    
-    public Exception getDaemonException()
-    {
-      return daemonException;
-    }
-    
-  }
-
 }

Modified: incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java?rev=1225740&r1=1225739&r2=1225740&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java
(original)
+++ incubator/lcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/BasePostgresql.java
Fri Dec 30 03:15:14 2011
@@ -27,26 +27,9 @@ import java.io.*;
 import java.util.*;
 import org.junit.*;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.log.Logger;
-
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-
 /** Tests that run the "agents daemon" should be derived from this */
-public class BasePostgresql extends org.apache.manifoldcf.crawler.tests.ConnectorBasePostgresql
+public class BasePostgresql extends org.apache.manifoldcf.crawler.tests.BaseITPostgresql
 {
-  public static final String agentShutdownSignal = "agent-process";
-  public static final int testPort = 8346;
-  
-  protected DaemonThread daemonThread = null;
-  protected Server server = null;
-
   protected String[] getConnectorNames()
   {
     return new String[]{"File Connector"};
@@ -67,395 +50,4 @@ public class BasePostgresql extends org.
     return new String[]{"org.apache.manifoldcf.agents.output.nullconnector.NullConnector"};
   }
   
-  // API support
-  
-  // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated
jetty
-  
-  /** Construct a command url.
-  */
-  protected String makeAPIURL(String command)
-  {
-    return "http://localhost:"+Integer.toString(testPort)+"/mcf-api-service/json/"+command;
-  }
-  
-  /** Perform an json API GET operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIGetOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    GetMethod method = new GetMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API DELETE operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIDeleteOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    DeleteMethod method = new DeleteMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API PUT operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPutOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PutMethod method = new PutMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API POST operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPostOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PostMethod method = new PostMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform a json GET API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIGetOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIGetOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json DELETE API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIDeleteOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIDeleteOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json PUT API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPutOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPutOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json POST API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPostOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPostOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  // Setup/teardown
-  
-  @Before
-  public void setUp()
-    throws Exception
-  {
-    super.setUp();
-    // Start jetty
-    server = new Server( testPort );    
-    server.setStopAtShutdown( true );
-
-    
-    String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
-    String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
-    String apiWarPath = "../../framework/build/war/mcf-api-service.war";
-
-    if (System.getProperty("crawlerWarPath") != null)
-    	crawlerWarPath = System.getProperty("crawlerWarPath");
-    if (System.getProperty("authorityserviceWarPath") != null)
-    	authorityserviceWarPath = System.getProperty("authorityserviceWarPath");
-    if (System.getProperty("apiWarPath") != null)
-    	apiWarPath = System.getProperty("apiWarPath");
-    
-    // Initialize the servlets
-    WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfCrawlerUI.setParentLoaderPriority(true);
-    server.addHandler(lcfCrawlerUI);
-    WebAppContext lcfAuthorityService = new WebAppContext(authorityserviceWarPath,"/mcf-authority-service");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfAuthorityService.setParentLoaderPriority(true);
-    server.addHandler(lcfAuthorityService);
-    WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
-    lcfApi.setParentLoaderPriority(true);
-    server.addHandler(lcfApi);
-    server.start();
-
-    // If all worked, then we can start the daemon.
-    // Clear the agents shutdown signal.
-    IThreadContext tc = ThreadContextFactory.make();
-    ILockManager lockManager = LockManagerFactory.make(tc);
-    lockManager.clearGlobalFlag(agentShutdownSignal);
-
-    daemonThread = new DaemonThread();
-    daemonThread.start();
-  }
-  
-  @After
-  public void cleanUp()
-    throws Exception
-  {
-    initialize();
-    if (isInitialized())
-    {
-      Exception currentException = null;
-      IThreadContext tc = ThreadContextFactory.make();
-
-      // Delete all jobs (and wait for them to go away)
-      if (daemonThread != null)
-      {
-        IJobManager jobManager = JobManagerFactory.make(tc);
-        
-        // Get a list of the current active jobs
-        IJobDescription[] jobs = jobManager.getAllJobs();
-        int i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Abort this job, if it is running
-          try
-          {
-            jobManager.manualAbort(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This generally means that the job was not running
-          }
-        }
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to stop
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              int statusValue = status.getStatus();
-              switch (statusValue)
-              {
-              case JobStatus.JOBSTATUS_NOTYETRUN:
-              case JobStatus.JOBSTATUS_COMPLETED:
-              case JobStatus.JOBSTATUS_ERROR:
-                break;
-              default:
-                ManifoldCF.sleep(10000);
-                continue;
-              }
-            }
-            break;
-          }
-        }
-
-        // Now, delete them all
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          try
-          {
-            jobManager.deleteJob(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This usually means that the job is already being deleted
-          }
-        }
-
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to disappear
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              ManifoldCF.sleep(10000);
-              continue;
-            }
-            break;
-          }
-        }
-
-        // Shut down daemon
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        lockManager.setGlobalFlag(agentShutdownSignal);
-      
-        // Wait for daemon thread to exit.
-        while (true)
-        {
-          if (daemonThread.isAlive())
-          {
-            Thread.sleep(1000L);
-            continue;
-          }
-          break;
-        }
-
-        Exception e = daemonThread.getDaemonException();
-        if (e != null)
-          currentException = e;
-      }
-      
-      if (server != null)
-      {
-        server.stop();
-        server.join();
-        server = null;
-      }
-      
-      // Clean up everything else
-      try
-      {
-        super.cleanUp();
-      }
-      catch (Exception e)
-      {
-        if (currentException == null)
-          currentException = e;
-      }
-      if (currentException != null)
-        throw currentException;
-    }
-  }
-  
-  protected static class DaemonThread extends Thread
-  {
-    protected Exception daemonException = null;
-    
-    public DaemonThread()
-    {
-      setName("Daemon thread");
-    }
-    
-    public void run()
-    {
-      IThreadContext tc = ThreadContextFactory.make();
-      // Now, start the server, and then wait for the shutdown signal.  On shutdown, we have
to actually do the cleanup,
-      // because the JVM isn't going away.
-      try
-      {
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        while (true)
-        {
-          // Any shutdown signal yet?
-          if (lockManager.checkGlobalFlag(agentShutdownSignal))
-            break;
-            
-          // Start whatever agents need to be started
-          ManifoldCF.startAgents(tc);
-
-          try
-          {
-            ManifoldCF.sleep(5000);
-          }
-          catch (InterruptedException e)
-          {
-            break;
-          }
-        }
-      }
-      catch (ManifoldCFException e)
-      {
-        daemonException = e;
-      }
-      finally
-      {
-        try
-        {
-          ManifoldCF.stopAgents(tc);
-        }
-        catch (ManifoldCFException e)
-        {
-          daemonException = e;
-        }
-      }
-    }
-    
-    public Exception getDaemonException()
-    {
-      return daemonException;
-    }
-    
-  }
-
 }

Modified: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java?rev=1225740&r1=1225739&r2=1225740&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
Fri Dec 30 03:15:14 2011
@@ -35,17 +35,9 @@ import org.mortbay.jetty.servlet.Context
 import org.mortbay.jetty.servlet.FilterHolder;
 import org.mortbay.log.Logger;
 
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-
 /** Tests that run the "agents daemon" should be derived from this */
-public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBase
+public class BaseDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby
 {
-  public static final String agentShutdownSignal = "agent-process";
-  public static final int testPort = 8346;
-  
-  protected DaemonThread daemonThread = null;
-  protected Server server = null;
   protected MockWikiService wikiService = null;
   
   protected String[] getConnectorNames()
@@ -86,395 +78,4 @@ public class BaseDerby extends org.apach
       wikiService.stop();
   }
   
-  // API support
-  
-  // These methods allow communication with the ManifoldCF api webapp, via the locally-instantiated
jetty
-  
-  /** Construct a command url.
-  */
-  protected String makeAPIURL(String command)
-  {
-    return "http://localhost:"+Integer.toString(testPort)+"/mcf-api-service/json/"+command;
-  }
-  
-  /** Perform an json API GET operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIGetOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    GetMethod method = new GetMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API DELETE operation.
-  *@param apiURL is the operation.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIDeleteOperation(String apiURL, int expectedResponse)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    DeleteMethod method = new DeleteMethod(apiURL);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API PUT operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPutOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PutMethod method = new PutMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform an json API POST operation.
-  *@param apiURL is the operation.
-  *@param input is the input JSON.
-  *@param expectedResponse is the expected response code.
-  *@return the json response.
-  */
-  protected String performAPIPostOperation(String apiURL, int expectedResponse, String input)
-    throws Exception
-  {
-    HttpClient client = new HttpClient();
-    PostMethod method = new PostMethod(apiURL);
-    method.setRequestHeader("Content-type", "text/plain; charset=UTF-8");
-    method.setRequestBody(input);
-    int response = client.executeMethod(method);
-    byte[] responseData = method.getResponseBody();
-    String responseString = new String(responseData,"utf-8");
-    if (response != expectedResponse)
-      throw new Exception("API http error; expected "+Integer.toString(expectedResponse)+",
saw "+Integer.toString(response)+": "+responseString);
-    // We presume that the data is utf-8, since that's what the API uses throughout.
-    return responseString;
-  }
-
-  /** Perform a json GET API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIGetOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIGetOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json DELETE API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIDeleteOperationViaNodes(String command, int expectedResponse)
-    throws Exception
-  {
-    String result = performAPIDeleteOperation(makeAPIURL(command),expectedResponse);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json PUT API operation, using Configuration structures to represent the json.
 This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPutOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPutOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  /** Perform a json POST API operation, using Configuration structures to represent the
json.  This is for testing convenience,
-  * mostly.
-  */
-  protected Configuration performAPIPostOperationViaNodes(String command, int expectedResponse,
Configuration argument)
-    throws Exception
-  {
-    String argumentJson;
-    if (argument != null)
-      argumentJson = argument.toJSON();
-    else
-      argumentJson = null;
-    
-    String result = performAPIPostOperation(makeAPIURL(command),expectedResponse,argumentJson);
-    Configuration cfg = new Configuration();
-    cfg.fromJSON(result);
-    return cfg;
-  }
-
-  // Setup/teardown
-  
-  @Before
-  public void setUp()
-    throws Exception
-  {
-    super.setUp();
-    // Start jetty
-    server = new Server( testPort );    
-    server.setStopAtShutdown( true );
-    
-    String crawlerWarPath = "../../framework/build/war/mcf-crawler-ui.war";
-    String authorityserviceWarPath = "../../framework/build/war/mcf-authority-service.war";
-    String apiWarPath = "../../framework/build/war/mcf-api-service.war";
-
-    if (System.getProperty("crawlerWarPath") != null)
-    	crawlerWarPath = System.getProperty("crawlerWarPath");
-    if (System.getProperty("authorityserviceWarPath") != null)
-    	authorityserviceWarPath = System.getProperty("authorityserviceWarPath");
-    if (System.getProperty("apiWarPath") != null)
-    	apiWarPath = System.getProperty("apiWarPath");
-
-    
-    // Initialize the servlets
-    WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/mcf-crawler-ui");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfCrawlerUI.setParentLoaderPriority(true);
-    server.addHandler(lcfCrawlerUI);
-    WebAppContext lcfAuthorityService = new WebAppContext(authorityserviceWarPath,"/mcf-authority-service");
-    // This will cause jetty to ignore all of the framework and jdbc jars in the war, which
is what we want.
-    lcfAuthorityService.setParentLoaderPriority(true);
-    server.addHandler(lcfAuthorityService);
-    WebAppContext lcfApi = new WebAppContext(apiWarPath,"/mcf-api-service");
-    lcfApi.setParentLoaderPriority(true);
-    server.addHandler(lcfApi);
-    server.start();
-
-    // If all worked, then we can start the daemon.
-    // Clear the agents shutdown signal.
-    IThreadContext tc = ThreadContextFactory.make();
-    ILockManager lockManager = LockManagerFactory.make(tc);
-    lockManager.clearGlobalFlag(agentShutdownSignal);
-
-    daemonThread = new DaemonThread();
-    daemonThread.start();
-  }
-  
-  @After
-  public void cleanUp()
-    throws Exception
-  {
-    initialize();
-    if (isInitialized())
-    {
-      Exception currentException = null;
-      IThreadContext tc = ThreadContextFactory.make();
-
-      // Delete all jobs (and wait for them to go away)
-      if (daemonThread != null)
-      {
-        IJobManager jobManager = JobManagerFactory.make(tc);
-        
-        // Get a list of the current active jobs
-        IJobDescription[] jobs = jobManager.getAllJobs();
-        int i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Abort this job, if it is running
-          try
-          {
-            jobManager.manualAbort(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This generally means that the job was not running
-          }
-        }
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to stop
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              int statusValue = status.getStatus();
-              switch (statusValue)
-              {
-              case JobStatus.JOBSTATUS_NOTYETRUN:
-              case JobStatus.JOBSTATUS_COMPLETED:
-              case JobStatus.JOBSTATUS_ERROR:
-                break;
-              default:
-                ManifoldCF.sleep(10000);
-                continue;
-              }
-            }
-            break;
-          }
-        }
-
-        // Now, delete them all
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          try
-          {
-            jobManager.deleteJob(desc.getID());
-          }
-          catch (ManifoldCFException e)
-          {
-            // This usually means that the job is already being deleted
-          }
-        }
-
-        i = 0;
-        while (i < jobs.length)
-        {
-          IJobDescription desc = jobs[i++];
-          // Wait for this job to disappear
-          while (true)
-          {
-            JobStatus status = jobManager.getStatus(desc.getID(),false);
-            if (status != null)
-            {
-              ManifoldCF.sleep(10000);
-              continue;
-            }
-            break;
-          }
-        }
-
-        // Shut down daemon
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        lockManager.setGlobalFlag(agentShutdownSignal);
-      
-        // Wait for daemon thread to exit.
-        while (true)
-        {
-          if (daemonThread.isAlive())
-          {
-            Thread.sleep(1000L);
-            continue;
-          }
-          break;
-        }
-
-        Exception e = daemonThread.getDaemonException();
-        if (e != null)
-          currentException = e;
-      }
-      
-      if (server != null)
-      {
-        server.stop();
-        server.join();
-        server = null;
-      }
-      
-      // Clean up everything else
-      try
-      {
-        super.cleanUp();
-      }
-      catch (Exception e)
-      {
-        if (currentException == null)
-          currentException = e;
-      }
-      if (currentException != null)
-        throw currentException;
-    }
-  }
-  
-  protected static class DaemonThread extends Thread
-  {
-    protected Exception daemonException = null;
-    
-    public DaemonThread()
-    {
-      setName("Daemon thread");
-    }
-    
-    public void run()
-    {
-      IThreadContext tc = ThreadContextFactory.make();
-      // Now, start the server, and then wait for the shutdown signal.  On shutdown, we have
to actually do the cleanup,
-      // because the JVM isn't going away.
-      try
-      {
-        ILockManager lockManager = LockManagerFactory.make(tc);
-        while (true)
-        {
-          // Any shutdown signal yet?
-          if (lockManager.checkGlobalFlag(agentShutdownSignal))
-            break;
-            
-          // Start whatever agents need to be started
-          ManifoldCF.startAgents(tc);
-
-          try
-          {
-            ManifoldCF.sleep(5000);
-          }
-          catch (InterruptedException e)
-          {
-            break;
-          }
-        }
-      }
-      catch (ManifoldCFException e)
-      {
-        daemonException = e;
-      }
-      finally
-      {
-        try
-        {
-          ManifoldCF.stopAgents(tc);
-        }
-        catch (ManifoldCFException e)
-        {
-          daemonException = e;
-        }
-      }
-    }
-    
-    public Exception getDaemonException()
-    {
-      return daemonException;
-    }
-    
-  }
-
 }



Mime
View raw message