You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by ry...@apache.org on 2008/09/29 03:42:45 UTC
svn commit: r699956 - in /labs/droids/branch/LABS-144/src:
core/java/org/apache/droids/ core/java/org/apache/droidsX/depot/filesystem/
core/java/org/apache/droidsX/impl/ examples/java/org/apache/droids/examples/
plugins/java/org/apache/droids/protocol/...
Author: ryan
Date: Sun Sep 28 18:42:45 2008
New Revision: 699956
URL: http://svn.apache.org/viewvc?rev=699956&view=rev
Log:
LABS-185 -- replace Core.threadMessage with SimpleThreads.threadMessage (Core will go away...)
Modified:
labs/droids/branch/LABS-144/src/core/java/org/apache/droids/AbstractDroid.java
labs/droids/branch/LABS-144/src/core/java/org/apache/droids/Core.java
labs/droids/branch/LABS-144/src/core/java/org/apache/droids/SimpleThreads.java
labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/depot/filesystem/FileSystemWorker.java
labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/impl/MultiThreadedTaskMaster.java
labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerCrawler.java
labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerWorker.java
labs/droids/branch/LABS-144/src/plugins/java/org/apache/droids/protocol/http/Http.java
labs/droids/branch/LABS-144/src/robots/java/org/apache/droids/HelloWorker.java
Modified: labs/droids/branch/LABS-144/src/core/java/org/apache/droids/AbstractDroid.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/core/java/org/apache/droids/AbstractDroid.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/core/java/org/apache/droids/AbstractDroid.java (original)
+++ labs/droids/branch/LABS-144/src/core/java/org/apache/droids/AbstractDroid.java Sun Sep 28 18:42:45 2008
@@ -55,12 +55,12 @@
//int y = worker.getDepth() + 1;
getPool().remove(worker);
getRunningWorker().remove(id);
- Core.threadMessage("Worker \"" + id + "\" has finished.");
+ SimpleThreads.threadMessage("Worker \"" + id + "\" has finished.");
if (getRunningWorker().size() == 0 & !getQueue().hasNext()) {
shutdownAndAwaitTermination();
- Core.threadMessage("All threads has finished.");
+ SimpleThreads.threadMessage("All threads has finished.");
} else if (getQueue().hasNext()) {
- Core.threadMessage("filling queue... "+getPool().getActiveCount());
+ SimpleThreads.threadMessage("filling queue... "+getPool().getActiveCount());
for (int i = 0; i < (getMaxThreads() - getPool().getActiveCount()); i++) {
if (!getQueue().hasNext()) {
break;
@@ -69,7 +69,7 @@
}
}
else {
- Core.threadMessage("queue is empty...");
+ SimpleThreads.threadMessage("queue is empty...");
}
}
}
@@ -90,12 +90,12 @@
initQueue();
} catch (DroidsException e) {
for (StackTraceElement message : e.getStackTrace()) {
- Core.threadMessage(message.getClassName()+"\n"+message.getLineNumber()+": "+
+ SimpleThreads.threadMessage(message.getClassName()+"\n"+message.getLineNumber()+": "+
message.getMethodName()+"\n"+message.toString());
}
}
startWorker();
- Core.threadMessage("Finshed invocation, waiting for workers to finish.");
+ SimpleThreads.threadMessage("Finshed invocation, waiting for workers to finish.");
}
/**
@@ -109,9 +109,9 @@
id = worker.getId();
getRunningWorker().put(id, worker);
getPool().execute(worker);
- Core.threadMessage("suspending "+id);
+ SimpleThreads.threadMessage("suspending "+id);
} catch (DroidsException e) {
- Core.threadMessage(e.getMessage());
+ SimpleThreads.threadMessage(e.getMessage());
}
return id;
}
@@ -212,16 +212,16 @@
* threads.
*/
protected void shutdownAndAwaitTermination() {
- Core.threadMessage("SHUTTING DOWN");
+ SimpleThreads.threadMessage("SHUTTING DOWN");
getPool().shutdown(); // Disable new tasks from being submitted
try {
// Wait a while for existing tasks to terminate
if (!getPool().awaitTermination(1, TimeUnit.SECONDS)) {
- Core.threadMessage("SHUT DOWN NOW");
+ SimpleThreads.threadMessage("SHUT DOWN NOW");
getPool().shutdownNow(); // Cancel currently executing tasks
// Wait a while for tasks to respond to being cancelled
if (!getPool().awaitTermination(1, TimeUnit.SECONDS)) {
- Core.threadMessage("Pool did not terminate");
+ SimpleThreads.threadMessage("Pool did not terminate");
}
}
} catch (InterruptedException ie) {
Modified: labs/droids/branch/LABS-144/src/core/java/org/apache/droids/Core.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/core/java/org/apache/droids/Core.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/core/java/org/apache/droids/Core.java (original)
+++ labs/droids/branch/LABS-144/src/core/java/org/apache/droids/Core.java Sun Sep 28 18:42:45 2008
@@ -95,16 +95,6 @@
droid.run();
}
- // Display a message, preceded by the name of the current thread
- /**
- * Since we are using for now exclusively the command line, the
- * method should be use to send message to the user.
- * @param message the message you want to send
- */
- public static void threadMessage(String message) {
- String threadName = Thread.currentThread().getName();
- System.out.format("%s: %s%n", threadName, message);
- }
/**
* Returns the parserFactory that knows all registered
Modified: labs/droids/branch/LABS-144/src/core/java/org/apache/droids/SimpleThreads.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/core/java/org/apache/droids/SimpleThreads.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/core/java/org/apache/droids/SimpleThreads.java (original)
+++ labs/droids/branch/LABS-144/src/core/java/org/apache/droids/SimpleThreads.java Sun Sep 28 18:42:45 2008
@@ -3,7 +3,7 @@
public class SimpleThreads {
//Display a message, preceded by the name of the current thread
- static void threadMessage(String message) {
+ public static void threadMessage(String message) {
String threadName = Thread.currentThread().getName();
System.out.format("%s: %s%n", threadName, message);
}
Modified: labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/depot/filesystem/FileSystemWorker.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/depot/filesystem/FileSystemWorker.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/depot/filesystem/FileSystemWorker.java (original)
+++ labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/depot/filesystem/FileSystemWorker.java Sun Sep 28 18:42:45 2008
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.droids.Core;
+import org.apache.droids.SimpleThreads;
import org.apache.droidsX.api.TaskQueue;
import org.apache.droidsX.api.Worker;
@@ -41,7 +42,7 @@
}
}
else {
- Core.threadMessage( "FILE: "+file.getAbsolutePath() );
+ SimpleThreads.threadMessage( "FILE: "+file.getAbsolutePath() );
}
}
}
\ No newline at end of file
Modified: labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/impl/MultiThreadedTaskMaster.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/impl/MultiThreadedTaskMaster.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/impl/MultiThreadedTaskMaster.java (original)
+++ labs/droids/branch/LABS-144/src/core/java/org/apache/droidsX/impl/MultiThreadedTaskMaster.java Sun Sep 28 18:42:45 2008
@@ -23,6 +23,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.droids.Core;
+import org.apache.droids.SimpleThreads;
import org.apache.droidsX.api.*;
public class MultiThreadedTaskMaster implements TaskMaster
@@ -53,7 +54,7 @@
this.runningWorker = new ConcurrentHashMap<Long, WorkerRunner>();
startWorkers();
- Core.threadMessage("Finshed invocation, waiting for workers to finish.");
+ SimpleThreads.threadMessage("Finshed invocation, waiting for workers to finish.");
}
@@ -65,12 +66,12 @@
//int y = worker.getDepth() + 1;
pool.remove(worker);
runningWorker.remove(id);
- Core.threadMessage("Worker \"" + id + "\" has finished.");
+ SimpleThreads.threadMessage("Worker \"" + id + "\" has finished.");
if (runningWorker.size() == 0 & !queue.hasNext()) {
shutdownAndAwaitTermination();
long elapsed = System.currentTimeMillis() - startedWorking.getTime();
- Core.threadMessage("All threads have finished. (elapsed:"+elapsed+")" );
+ SimpleThreads.threadMessage("All threads have finished. (elapsed:"+elapsed+")" );
droid.finished();
} else if (queue.hasNext()) {
startWorkers();
@@ -102,10 +103,10 @@
WorkerRunner runner = new WorkerRunner();
runningWorker.put(runner.getId(), runner);
pool.execute(runner);
- Core.threadMessage("starting "+runner.getId());
+ SimpleThreads.threadMessage("starting "+runner.getId());
}
catch (Exception e) {
- Core.threadMessage(e.getMessage());
+ SimpleThreads.threadMessage(e.getMessage());
}
}
}
@@ -133,16 +134,16 @@
* threads.
*/
protected void shutdownAndAwaitTermination() {
- Core.threadMessage("SHUTTING DOWN");
+ SimpleThreads.threadMessage("SHUTTING DOWN");
pool.shutdown(); // Disable new tasks from being submitted
try {
// Wait a while for existing tasks to terminate
if (!pool.awaitTermination(1, TimeUnit.SECONDS)) {
- Core.threadMessage("SHUT DOWN NOW");
+ SimpleThreads.threadMessage("SHUT DOWN NOW");
pool.shutdownNow(); // Cancel currently executing tasks
// Wait a while for tasks to respond to being canceled
if (!pool.awaitTermination(1, TimeUnit.SECONDS)) {
- Core.threadMessage("Pool did not terminate");
+ SimpleThreads.threadMessage("Pool did not terminate");
}
}
} catch (InterruptedException ie) {
Modified: labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerCrawler.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerCrawler.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerCrawler.java (original)
+++ labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerCrawler.java Sun Sep 28 18:42:45 2008
@@ -6,6 +6,7 @@
import org.apache.droids.Core;
import org.apache.droids.HelloCrawler;
+import org.apache.droids.SimpleThreads;
import org.apache.droids.api.Worker;
import org.apache.droids.exception.DroidsException;
import org.apache.droids.handle.Solr;
@@ -45,7 +46,7 @@
new ByteArrayInputStream(out.toByteArray()));
post = new PostFile(updateUrl, stream);
} catch (Exception e) {
- Core.threadMessage(e.getMessage());
+ SimpleThreads.threadMessage(e.getMessage());
}
}
Modified: labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerWorker.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerWorker.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerWorker.java (original)
+++ labs/droids/branch/LABS-144/src/examples/java/org/apache/droids/examples/IndexerWorker.java Sun Sep 28 18:42:45 2008
@@ -6,6 +6,7 @@
import org.apache.droids.Core;
import org.apache.droids.HelloWorker;
+import org.apache.droids.SimpleThreads;
import org.apache.droids.api.Handler;
import org.apache.droids.api.Parse;
import org.apache.droids.exception.DroidsException;
@@ -17,7 +18,7 @@
try {
handler.handle(getProtocol().openStream(getUri()), new URL(getUri()), parse);
} catch (Exception e) {
- Core.threadMessage(e.getMessage());
+ SimpleThreads.threadMessage(e.getMessage());
}
try {
getDroid().finishedWorker(super.getId());
Modified: labs/droids/branch/LABS-144/src/plugins/java/org/apache/droids/protocol/http/Http.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/plugins/java/org/apache/droids/protocol/http/Http.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/plugins/java/org/apache/droids/protocol/http/Http.java (original)
+++ labs/droids/branch/LABS-144/src/plugins/java/org/apache/droids/protocol/http/Http.java Sun Sep 28 18:42:45 2008
@@ -23,6 +23,7 @@
import java.net.URL;
import org.apache.droids.Core;
+import org.apache.droids.SimpleThreads;
import org.apache.droids.api.Protocol;
import org.apache.droids.net.UrlHelper;
import org.apache.droids.protocol.HttpBase;
@@ -92,7 +93,7 @@
}
}
String message = (test) ? "allowed" : "denied";
- Core.threadMessage("Url is " + message);
+ SimpleThreads.threadMessage("Url is " + message);
return test;
}
Modified: labs/droids/branch/LABS-144/src/robots/java/org/apache/droids/HelloWorker.java
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/src/robots/java/org/apache/droids/HelloWorker.java?rev=699956&r1=699955&r2=699956&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/src/robots/java/org/apache/droids/HelloWorker.java (original)
+++ labs/droids/branch/LABS-144/src/robots/java/org/apache/droids/HelloWorker.java Sun Sep 28 18:42:45 2008
@@ -74,7 +74,7 @@
@Override
public void run() {
final String userAgent = this.getClass().getCanonicalName();
- Core.threadMessage("Starting " + userAgent);
+ SimpleThreads.threadMessage("Starting " + userAgent);
try {
if(delayTimer.getDelayMillis() > 0)
{
@@ -83,24 +83,24 @@
}
setUri(link.getId());
String url = getUri();
- Core.threadMessage("url " + url);
+ SimpleThreads.threadMessage("url " + url);
final Protocol protocol = protocolFactory.getProtocol(url);
setProtocol(protocol);
openStream = getProtocol().openStream(getUri());
long workerId = getId();
if (protocol.isAllowed(url)) {
String contentType = protocol.getContentType(url);
- Core.threadMessage("contentType " + contentType);
+ SimpleThreads.threadMessage("contentType " + contentType);
if (contentType!=null){
parser = parserFactory.getParser(contentType);
}
// parse contains the outlinks and can be used later
Parse parse = getParse();
handle(parse);
- //Core.threadMessage("Trying to shut down "+getId());
+ //SimpleThreads.threadMessage("Trying to shut down "+getId());
getDroid().finishedWorker(workerId);
} else {
- Core.threadMessage("stopping processing since"
+ SimpleThreads.threadMessage("stopping processing since"
+ " bots are not allowed for this url.");
getDroid().finishedWorker(workerId);
}
@@ -131,7 +131,7 @@
// all links from the page unfiltered
filter(parse);
} catch (Exception e) {
- Core.threadMessage(e.getMessage());
+ SimpleThreads.threadMessage(e.getMessage());
}
}
return parse;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org