You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by rf...@apache.org on 2011/03/08 15:26:53 UTC
svn commit: r1079393 - in /incubator/droids/trunk:
droids-core/src/main/java/org/apache/droids/
droids-core/src/main/java/org/apache/droids/handle/
droids-core/src/main/java/org/apache/droids/impl/
droids-core/src/main/java/org/apache/droids/net/ droid...
Author: rfrovarp
Date: Tue Mar 8 15:26:52 2011
New Revision: 1079393
URL: http://svn.apache.org/viewvc?rev=1079393&view=rev
Log:
Partial patch for DROIDS-122.
Patch from Jeremy Arnold.
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SysoutHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/DefaultTaskExceptionHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MaxDepthTaskValidator.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/AlreadyVisitedFilter.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/HostFilter.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/ParseImpl.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/file/FileProtocol.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/DroidsRequestRetryHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpContentEntity.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/NoAuthHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingDroid.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/SimpleWalkingDroid.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/validator/ChainTaskValidator.java
incubator/droids/trunk/droids-crawler-web/pom.xml
incubator/droids/trunk/droids-crawler/pom.xml
incubator/droids/trunk/droids-norobots/src/main/java/org/apache/droids/norobots/SimpleContentLoader.java
incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/AdvancedSolrHandler.java
incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/SolrHandler.java
incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java
incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/DroidPanel.java
incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/WorkBeanDataProvider.java
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java Tue Mar 8 15:26:52 2011
@@ -35,7 +35,8 @@ public abstract class AbstractDroid<T ex
this.queue = queue;
this.taskMaster = taskMaster;
}
-
+
+ @Override
public void start()
{
taskMaster.processAllTasks(queue, this);
@@ -45,6 +46,7 @@ public abstract class AbstractDroid<T ex
return queue;
}
+ @Override
public TaskMaster<T> getTaskMaster() {
return taskMaster;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java Tue Mar 8 15:26:52 2011
@@ -52,10 +52,12 @@ public class LinkTask implements Link, S
this.weight = weight;
}
+ @Override
public String getId() {
return uri.toString();
}
+ @Override
public Date getTaskDate() {
return started;
}
@@ -64,18 +66,22 @@ public class LinkTask implements Link, S
this.started = started;
}
+ @Override
public int getDepth() {
return depth;
}
+ @Override
public Link getFrom() {
return from;
}
+ @Override
public Collection<URI> getTo() {
return linksTo;
}
+ @Override
public Date getLastModifiedDate() {
return lastModifedDate;
}
@@ -88,10 +94,12 @@ public class LinkTask implements Link, S
this.linksTo = linksTo;
}
+ @Override
public URI getURI() {
return uri;
}
+ @Override
public String getAnchorText() {
return anchorText;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SysoutHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SysoutHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SysoutHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SysoutHandler.java Tue Mar 8 15:26:52 2011
@@ -42,6 +42,7 @@ public class SysoutHandler extends Write
pipe(reader, output);
}
+ @Override
public void handle(URI uri, ContentEntity entity) throws IOException {
InputStream instream = entity.obtainContent();
try {
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/DefaultTaskExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/DefaultTaskExceptionHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/DefaultTaskExceptionHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/DefaultTaskExceptionHandler.java Tue Mar 8 15:26:52 2011
@@ -24,6 +24,7 @@ import org.apache.droids.exception.Droid
public class DefaultTaskExceptionHandler implements TaskExceptionHandler {
+ @Override
public TaskExceptionResult handleException(Exception ex) {
if (ex instanceof IOException) {
return TaskExceptionResult.WARN;
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MaxDepthTaskValidator.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MaxDepthTaskValidator.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MaxDepthTaskValidator.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MaxDepthTaskValidator.java Tue Mar 8 15:26:52 2011
@@ -33,6 +33,7 @@ public class MaxDepthTaskValidator<T ext
this.maxDepth = maxDepth;
}
+ @Override
public T validateTask(T task) throws InvalidTaskException {
if( maxDepth > 0 && task.getDepth() > maxDepth ) {
throw new InvalidTaskException(
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java Tue Mar 8 15:26:52 2011
@@ -94,6 +94,7 @@ public class MultiThreadedTaskMaster<T e
this( null );
}
+ @Override
public Thread newThread(Runnable r) {
Thread t = new Thread(group, r,
prefix + threadNumber.getAndIncrement(),
@@ -109,6 +110,7 @@ public class MultiThreadedTaskMaster<T e
/**
* The queue has been initialized
*/
+ @Override
public void processAllTasks(final TaskQueue<T> queue, final Droid<T> droid) {
if( state == ExecutionState.RUNNING ) {
// TODO? throw an error?
@@ -198,6 +200,7 @@ public class MultiThreadedTaskMaster<T e
*/
protected Future<?> submitNewTaskRunner(ExecutorService executor, final TaskQueue<? extends T> queue) {
return executor.submit(new Runnable() {
+ @Override
public void run() {
String threadName = Thread.currentThread().getName();
@@ -315,6 +318,7 @@ public class MultiThreadedTaskMaster<T e
return maxThreads;
}
+ @Override
public ExecutionState getExecutionState() {
return state;
}
@@ -349,7 +353,7 @@ public class MultiThreadedTaskMaster<T e
}
}
-
+ @Override
public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
log.info("awaitTermination()");
return pool.awaitTermination(timeout, unit);
@@ -367,18 +371,22 @@ public class MultiThreadedTaskMaster<T e
this.delayTimer = delayTimer;
}
+ @Override
public long getCompletedTasks() {
return completedCount.get();
}
+ @Override
public Date getFinishedWorking() {
return finishedWorking;
}
+ @Override
public T getLastCompletedTask() {
return lastCompletedTask;
}
+ @Override
public Date getStartTime() {
return startedWorking;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java Tue Mar 8 15:26:52 2011
@@ -52,6 +52,7 @@ public class SequentialTaskMaster<T exte
/**
* The queue has been initialized
*/
+ @Override
public synchronized void processAllTasks(
final TaskQueue<T> queue, final Droid<T> droid)
{
@@ -121,26 +122,27 @@ public class SequentialTaskMaster<T exte
return startedWorking != null && finishedWorking == null;
}
+ @Override
public Date getStartTime() {
return startedWorking;
}
-
+ @Override
public Date getFinishedWorking() {
return finishedWorking;
}
-
+ @Override
public long getCompletedTasks() {
return completedTask;
}
-
+ @Override
public T getLastCompletedTask() {
return lastCompletedTask;
}
-
+ @Override
public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
if (timeout < 0) {
timeout = 0;
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java Tue Mar 8 15:26:52 2011
@@ -56,6 +56,7 @@ public class SimpleTaskQueue<T extends T
/*
* @see org.apache.droids.api.Queue#getTask(java.lang.String)
*/
+ @Override
public T getTask(String id) {
return taskMap.get(id);
}
@@ -63,15 +64,17 @@ public class SimpleTaskQueue<T extends T
/*
* @see org.apache.droids.api.Queue#totalSize()
*/
+ @Override
public int getSize() {
return queue.size();
}
-
+ @Override
public boolean hasNext() {
return !queue.isEmpty();
}
+ @Override
public void merge(T task) throws InvalidTaskException {
// if we already have the id in our map, then don't add it to the queue...
synchronized( taskMap ) {
@@ -88,6 +91,7 @@ public class SimpleTaskQueue<T extends T
* Tasks with duplicate keys will be overwritten
* @throws InvalidTaskException
*/
+ @Override
public void merge(Collection<? extends T> tasks) {
for( T task : tasks ) {
try{
@@ -99,6 +103,7 @@ public class SimpleTaskQueue<T extends T
}
}
+ @Override
public T next() {
T task = queue.poll();
if( task != null ) {
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/AlreadyVisitedFilter.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/AlreadyVisitedFilter.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/AlreadyVisitedFilter.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/AlreadyVisitedFilter.java Tue Mar 8 15:26:52 2011
@@ -36,7 +36,8 @@ public class AlreadyVisitedFilter implem
super();
this.visited = new HashSet<URI>();
}
-
+
+ @Override
public String filter(final String url) {
try {
URI uri = new URI(url);
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/HostFilter.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/HostFilter.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/HostFilter.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/HostFilter.java Tue Mar 8 15:26:52 2011
@@ -47,7 +47,8 @@ public class HostFilter implements URLFi
this.allowedHosts.add(allowedHost);
}
}
-
+
+ @Override
public String filter(final String url) {
try {
URI uri = new URI(url);
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java Tue Mar 8 15:26:52 2011
@@ -60,6 +60,7 @@ public class RegexURLFilter extends Logg
*
* @see org.apache.droids.api.URLFilter#filter(java.lang.String)
*/
+ @Override
public String filter(String url) {
synchronized (rules) {
for (RegexRule rule : rules) {
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/ParseImpl.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/ParseImpl.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/ParseImpl.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/ParseImpl.java Tue Mar 8 15:26:52 2011
@@ -44,6 +44,7 @@ public class ParseImpl implements Parse
this.outlinks = outlinks;
}
+ @Override
public String getText() {
return text;
}
@@ -52,6 +53,7 @@ public class ParseImpl implements Parse
this.text = text;
}
+ @Override
public Object getData() {
return data;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java Tue Mar 8 15:26:52 2011
@@ -58,6 +58,7 @@ public class HtmlParser extends Loggable
this.elements = elements;
}
+ @Override
public Parse parse(ContentEntity entity, Link newLink) throws DroidsException, IOException {
// setup filter chain
XMLDocumentFilter[] filters = { getRemover() };
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/file/FileProtocol.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/file/FileProtocol.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/file/FileProtocol.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/file/FileProtocol.java Tue Mar 8 15:26:52 2011
@@ -33,11 +33,13 @@ public class FileProtocol implements Pro
FileInputStream fileInputStream=null;
+ @Override
public boolean isAllowed(URI uri) {
File file = new File(extractLocation(uri));
return file.canRead();
}
+ @Override
public ManagedContentEntity load(URI uri) throws IOException {
File file = new File(extractLocation(uri));
return new FileContentEntity(file);
@@ -76,25 +78,31 @@ public class FileProtocol implements Pro
}
}
+ @Override
public InputStream obtainContent() throws IOException {
return new BufferedInputStream(new FileInputStream(file));
}
+ @Override
public void finish() {
}
+ @Override
public String getMimeType() {
return mimeType;
}
+ @Override
public String getCharset() {
return charset;
}
+ @Override
public Parse getParse() {
return this.parse;
}
+ @Override
public void setParse(Parse parse) {
this.parse = parse;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/DroidsRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/DroidsRequestRetryHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/DroidsRequestRetryHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/DroidsRequestRetryHandler.java Tue Mar 8 15:26:52 2011
@@ -45,6 +45,7 @@ class DroidsRequestRetryHandler implemen
this(3);
}
+ @Override
public boolean retryRequest(final IOException exception, int executionCount,
final HttpContext context)
{
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpContentEntity.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpContentEntity.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpContentEntity.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpContentEntity.java Tue Mar 8 15:26:52 2011
@@ -73,27 +73,33 @@ public class HttpContentEntity implement
}
}
}
-
+
+ @Override
public String getMimeType() {
return mimeType;
}
+ @Override
public String getCharset() {
return charset;
}
+ @Override
public InputStream obtainContent() throws IOException {
return entity.getContent();
}
+ @Override
public Parse getParse() {
return this.parse;
}
+ @Override
public void setParse(Parse parse) {
this.parse = parse;
}
+ @Override
public void finish() {
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java Tue Mar 8 15:26:52 2011
@@ -57,7 +57,8 @@ public class HttpProtocol extends Loggab
public HttpProtocol() {
this(new DroidsHttpClient());
}
-
+
+ @Override
public ManagedContentEntity load(URI uri) throws IOException {
HttpGet httpget = new HttpGet(uri);
HttpResponse response = httpclient.execute(httpget);
@@ -76,6 +77,7 @@ public class HttpProtocol extends Loggab
return new HttpContentEntity(entity, maxlen);
}
+ @Override
public boolean isAllowed(URI uri) throws IOException {
if (forceAllow) {
return forceAllow;
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/NoAuthHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/NoAuthHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/NoAuthHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/NoAuthHandler.java Tue Mar 8 15:26:52 2011
@@ -30,17 +30,20 @@ import org.apache.http.protocol.HttpCont
class NoAuthHandler implements AuthenticationHandler
{
+ @Override
public Map<String, Header> getChallenges(HttpResponse response, HttpContext context)
throws MalformedChallengeException
{
return Collections.emptyMap();
}
+ @Override
public boolean isAuthenticationRequested(HttpResponse response, HttpContext context)
{
return false;
}
+ @Override
public AuthScheme selectScheme(Map<String, Header> challenges, HttpResponse response, HttpContext context)
throws AuthenticationException
{
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingDroid.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingDroid.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingDroid.java Tue Mar 8 15:26:52 2011
@@ -49,7 +49,8 @@ public abstract class CrawlingDroid exte
public void setInitialLocations(Collection<String> initialLocations) {
this.initialLocations = initialLocations;
}
-
+
+ @Override
public void init() throws InvalidTaskException {
Preconditions.checkState( initialLocations != null, "WebCrawlerDroid requires at least one starting file" );
Preconditions.checkState( !initialLocations.isEmpty(), "WebCrawlerDroid requires at least one starting file" );
@@ -68,7 +69,8 @@ public abstract class CrawlingDroid exte
{
taskMaster.processAllTasks(queue, this);
}
-
+
+ @Override
public void finished()
{
log.info( "FINISHED!!!" );
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java Tue Mar 8 15:26:52 2011
@@ -44,6 +44,7 @@ public class CrawlingWorker extends Logg
this.droid = droid;
}
+ @Override
public void execute(Link link) throws DroidsException, IOException
{
final String userAgent = this.getClass().getCanonicalName();
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java Tue Mar 8 15:26:52 2011
@@ -37,15 +37,18 @@ public class FileTask implements Task
this.depth = depth;
this.started = new Date();
}
-
+
+ @Override
public String getId() {
return file.getPath();
}
+ @Override
public Date getTaskDate() {
return started;
}
+ @Override
public int getDepth() {
return depth;
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java Tue Mar 8 15:26:52 2011
@@ -32,6 +32,7 @@ public class FileWorker extends Loggable
this.queue = queue;
}
+ @Override
public void execute(FileTask task) throws InvalidTaskException
{
File file = task.getFile();
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/SimpleWalkingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/SimpleWalkingDroid.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/SimpleWalkingDroid.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/SimpleWalkingDroid.java Tue Mar 8 15:26:52 2011
@@ -38,10 +38,12 @@ public class SimpleWalkingDroid extends
super( queue, taskMaster );
}
+ @Override
public void setInitialFiles(Collection<File> initialFiles) {
this.initialFiles = initialFiles;
}
-
+
+ @Override
public void init() throws InvalidTaskException {
Preconditions.checkState(initialFiles != null, "FileSystemWalker requires at least one starting file" );
Preconditions.checkState( !initialFiles.isEmpty(), "FileSystemWalker requires at least one starting file" );
@@ -49,12 +51,14 @@ public class SimpleWalkingDroid extends
queue.merge( new FileTask( file, 0 ) );
}
}
-
+
+ @Override
public void finished()
{
log.info( "FINISHED!!!" );
}
+ @Override
public FileWorker getNewWorker() {
return new FileWorker( queue );
}
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/validator/ChainTaskValidator.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/validator/ChainTaskValidator.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/validator/ChainTaskValidator.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/validator/ChainTaskValidator.java Tue Mar 8 15:26:52 2011
@@ -36,6 +36,7 @@ public final class ChainTaskValidator<T
this.validatorChain = new LinkedHashSet<TaskValidator<T>>();
}
+ @Override
public final T validateTask(final T task) throws InvalidTaskException {
T currentResult = task;
for (final TaskValidator<T> taskValidator : this.validatorChain) {
Modified: incubator/droids/trunk/droids-crawler-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler-web/pom.xml?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-crawler-web/pom.xml (original)
+++ incubator/droids/trunk/droids-crawler-web/pom.xml Tue Mar 8 15:26:52 2011
@@ -78,8 +78,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: incubator/droids/trunk/droids-crawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/pom.xml?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-crawler/pom.xml (original)
+++ incubator/droids/trunk/droids-crawler/pom.xml Tue Mar 8 15:26:52 2011
@@ -212,8 +212,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: incubator/droids/trunk/droids-norobots/src/main/java/org/apache/droids/norobots/SimpleContentLoader.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-norobots/src/main/java/org/apache/droids/norobots/SimpleContentLoader.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-norobots/src/main/java/org/apache/droids/norobots/SimpleContentLoader.java (original)
+++ incubator/droids/trunk/droids-norobots/src/main/java/org/apache/droids/norobots/SimpleContentLoader.java Tue Mar 8 15:26:52 2011
@@ -38,6 +38,7 @@ import java.net.URLConnection;
public class SimpleContentLoader implements ContentLoader
{
+ @Override
public boolean exists(URI uri) throws IOException
{
URL url = uri.toURL();
@@ -49,6 +50,7 @@ public class SimpleContentLoader impleme
}
}
+ @Override
public InputStream load(URI uri) throws IOException {
URL url = uri.toURL();
URLConnection conn = url.openConnection();
Modified: incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/AdvancedSolrHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/AdvancedSolrHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/AdvancedSolrHandler.java (original)
+++ incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/AdvancedSolrHandler.java Tue Mar 8 15:26:52 2011
@@ -112,6 +112,7 @@ public class AdvancedSolrHandler impleme
/*
* @see org.apache.droids.api.Handler#handle(java.net.URI, org.apache.droids.api.ContentEntity)
*/
+ @Override
public void handle(URI uri, ContentEntity entity) throws IOException, DroidsException {
SolrInputDocument doc = createSolrInputDocument(uri, entity);
try {
Modified: incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/SolrHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/SolrHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/SolrHandler.java (original)
+++ incubator/droids/trunk/droids-solr/src/main/java/org/apache/droids/solr/SolrHandler.java Tue Mar 8 15:26:52 2011
@@ -31,6 +31,7 @@ public class SolrHandler implements Hand
private SolrServer solr;
+ @Override
public void handle(URI uri, ContentEntity entity)
throws IOException, DroidsException
{
Modified: incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java (original)
+++ incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/EchoHandler.java Tue Mar 8 15:26:52 2011
@@ -54,6 +54,7 @@ public class EchoHandler extends Default
*
* @see org.xml.sax.helpers.DefaultHandler#startDocument()
*/
+ @Override
public void startDocument() throws SAXException {
xmlBuffer = new StringBuffer();
xmlBuffer.append("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\r\n");
@@ -64,6 +65,7 @@ public class EchoHandler extends Default
*
* @see org.xml.sax.helpers.DefaultHandler#endDocument()
*/
+ @Override
public void endDocument() throws SAXException {
try {
setResult();
@@ -86,6 +88,7 @@ public class EchoHandler extends Default
* @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String,
* java.lang.String, java.lang.String, org.xml.sax.Attributes)
*/
+ @Override
public void startElement(String uri, String loc, String raw, Attributes atts)
throws SAXException {
xmlBuffer.append("\r\n<" + raw);
@@ -113,6 +116,7 @@ public class EchoHandler extends Default
* @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String,
* java.lang.String, java.lang.String)
*/
+ @Override
public void endElement(String uri, String loc, String raw)
throws SAXException {
xmlBuffer.append("\r\n</" + raw + ">\r\n");
@@ -127,6 +131,7 @@ public class EchoHandler extends Default
*
* @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
*/
+ @Override
public void characters(char ch[], int start, int length) throws SAXException {
for (int i = 0; i < length; i++) {
char c = ch[start + i];
@@ -152,6 +157,7 @@ public class EchoHandler extends Default
* @see org.xml.sax.helpers.DefaultHandler#ignorableWhitespace(char[], int,
* int)
*/
+ @Override
public void ignorableWhitespace(char ch[], int start, int length)
throws SAXException {
this.characters(ch, start, length);
@@ -166,6 +172,7 @@ public class EchoHandler extends Default
* @see org.xml.sax.helpers.DefaultHandler#processingInstruction(java.lang.String,
* java.lang.String)
*/
+ @Override
public void processingInstruction(String target, String data)
throws SAXException {
xmlBuffer.append("<?" + target + " " + data + "?>");
@@ -179,6 +186,7 @@ public class EchoHandler extends Default
*
* @see org.xml.sax.helpers.DefaultHandler#skippedEntity(java.lang.String)
*/
+ @Override
public void skippedEntity(String name) throws SAXException {
xmlBuffer.append("&" + name + ";");
}
Modified: incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/DroidPanel.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/DroidPanel.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/DroidPanel.java (original)
+++ incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/DroidPanel.java Tue Mar 8 15:26:52 2011
@@ -138,6 +138,7 @@ public class DroidPanel extends Panel
workers.setOutputMarkupId( true );
workers.add(new DataView<WorkBean>("task", new WorkBeanDataProvider(
new AbstractReadOnlyModel<SimpleWorkMonitor>() {
+ @Override
public SimpleWorkMonitor getObject() {
return monitor;
}
Modified: incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/WorkBeanDataProvider.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/WorkBeanDataProvider.java?rev=1079393&r1=1079392&r2=1079393&view=diff
==============================================================================
--- incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/WorkBeanDataProvider.java (original)
+++ incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/component/WorkBeanDataProvider.java Tue Mar 8 15:26:52 2011
@@ -48,6 +48,7 @@ public class WorkBeanDataProvider<T exte
@SuppressWarnings("unchecked")
+ @Override
public IModel<WorkBean<T>> model( WorkBean<T> object) {
final Task t = object.getTask();
return new AbstractReadOnlyModel<WorkBean<T>>() {