Author: tobr
Date: Mon Sep 10 11:38:01 2012
New Revision: 1382765
URL: http://svn.apache.org/viewvc?rev=1382765&view=rev
Log:
moved example file to droids-examples
DROIDS-89
Added:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/FileRenameDroid.java
(props changed)
- copied unchanged from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SaveCrawlingDroid.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/droids-example-context.xml
(props changed)
- copied unchanged from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/droids-example-context.xml
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/
- copied from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/handler/
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
(with props)
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/package-info.java
(props changed)
- copied unchanged from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/package-info.java
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/SimpleRuntime.java
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/TestCrawlingWorker.java
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java
(contents, props changed)
- copied, changed from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleDroid.java
Removed:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/SimpleRuntime.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/droids-example-context.xml
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/handler/
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/package-info.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SaveCrawlingDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleDroid.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/TestCrawlingWorker.java
Modified:
incubator/droids/trunk/droids-examples/pom.xml
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
incubator/droids/trunk/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
incubator/droids/trunk/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
incubator/droids/trunk/droids-spring/src/test/resources/droids-core-test-context.xml
Copied:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java?p2=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
(original)
+++
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
Mon Sep 10 11:38:01 2012
@@ -16,17 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.impl;
+package org.apache.droids.robot.crawler;
import java.util.Queue;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.api.Link;
import org.apache.droids.api.TaskMaster;
import org.apache.droids.api.Worker;
-import org.apache.droids.examples.handler.ReportHandler;
-import org.apache.droids.robot.crawler.CrawlingDroid;
-import org.apache.droids.robot.crawler.CrawlingWorker;
+import org.apache.droids.handle.ReportHandler;
+import org.apache.droids.helper.factories.HandlerFactory;
+
+/**
+ *
+ * This simple CrawlingDroid uses the ReportHandler to handle all retrieved
files.
+ *
+ */
public class ReportCrawlingDroid extends CrawlingDroid {
public ReportCrawlingDroid(Queue<Link> queue, TaskMaster<Link> taskMaster) {
@@ -36,7 +40,9 @@ public class ReportCrawlingDroid extends
@Override
public Worker<Link> getNewWorker() {
final CrawlingWorker worker = new CrawlingWorker( this );
- worker.setHandlerFactory(DroidsFactory.createDefaultHandlerFactory(new
ReportHandler()));
+ HandlerFactory handlerFactory = new HandlerFactory();
+ handlerFactory.getMap().put("default", new ReportHandler());
+ worker.setHandlerFactory(handlerFactory);
return worker;
}
Propchange:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/ReportCrawlingDroid.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/droids/trunk/droids-examples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/pom.xml?rev=1382765&r1=1382764&r2=1382765&view=diff
==============================================================================
--- incubator/droids/trunk/droids-examples/pom.xml (original)
+++ incubator/droids/trunk/droids-examples/pom.xml Mon Sep 10 11:38:01 2012
@@ -53,5 +53,24 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Copied:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java?p2=incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
(original)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java
Mon Sep 10 11:38:01 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids;
+package org.apache.droids.examples;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,15 +35,19 @@ import org.apache.droids.helper.factorie
import org.apache.droids.helper.factories.ProtocolFactory;
import org.apache.droids.helper.factories.URLFiltersFactory;
import org.apache.droids.impl.DefaultTaskExceptionHandler;
-import org.apache.droids.impl.ExceptionCrawlingDroid;
-import org.apache.droids.impl.ReportCrawlingDroid;
-import org.apache.droids.impl.SaveCrawlingDroid;
import org.apache.droids.impl.SequentialTaskMaster;
import org.apache.droids.impl.SimpleTaskQueueWithHistory;
import org.apache.droids.parse.html.HtmlParser;
import org.apache.droids.protocol.http.HttpProtocol;
import org.apache.droids.robot.crawler.CrawlingDroid;
+import org.apache.droids.robot.crawler.ReportCrawlingDroid;
+
+/**
+ *
+ * Helper class for creating defaults.
+ *
+ */
public class DroidsFactory
{
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/DroidsFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java?p2=incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
(original)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java
Mon Sep 10 11:38:01 2012
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.impl;
+package org.apache.droids.examples;
import java.util.Queue;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.api.Handler;
import org.apache.droids.api.Link;
import org.apache.droids.api.TaskMaster;
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/ExceptionCrawlingDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/FileRenameDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/FileRenameDroid.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SaveCrawlingDroid.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java?p2=incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SaveCrawlingDroid.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SaveCrawlingDroid.java
(original)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java
Mon Sep 10 11:38:01 2012
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.impl;
+package org.apache.droids.examples;
import java.util.Queue;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.api.Handler;
import org.apache.droids.api.Link;
import org.apache.droids.api.TaskMaster;
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SaveCrawlingDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java?p2=incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
(original)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java
Mon Sep 10 11:38:01 2012
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.impl;
+package org.apache.droids.examples;
import java.util.Queue;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.api.Link;
import org.apache.droids.api.TaskMaster;
import org.apache.droids.api.Worker;
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/SysoutCrawlingDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/droids-example-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/droids-example-context.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ExceptionReportHandler.java?rev=1382765&r1=1381505&r2=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
(original)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
Mon Sep 10 11:38:01 2012
@@ -23,6 +23,7 @@ import java.net.URI;
import org.apache.droids.api.ContentEntity;
import org.apache.droids.exception.DroidsException;
+import org.apache.droids.handle.ReportHandler;
public class ExceptionReportHandler extends ReportHandler {
Added:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java?rev=1382765&view=auto
==============================================================================
---
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
(added)
+++
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
Mon Sep 10 11:38:01 2012
@@ -0,0 +1,58 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.droids.examples.handler;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.droids.api.ContentEntity;
+import org.apache.droids.api.Handler;
+import org.apache.droids.exception.DroidsException;
+
+/**
+ *
+ * Simple handler that writes the handled URIs to a Set.
+ * Useful for retrieving all visited URIs.
+ *
+ */
+public class ReportHandler implements Handler {
+
+ private static Set<String> report;
+
+ static {
+ report = Collections.synchronizedSet(new HashSet<String>());
+ }
+
+ @Override
+ public void handle(URI uri, ContentEntity entity) throws IOException,
+ DroidsException {
+ report.add(uri.toString());
+ }
+
+ public static Set<String> getReport() {
+ return report;
+ }
+
+ public static void recycle() {
+ report.clear();
+ }
+}
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/handler/ReportHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange:
incubator/droids/trunk/droids-examples/src/main/java/org/apache/droids/examples/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/SimpleRuntime.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java?p2=incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/SimpleRuntime.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/SimpleRuntime.java
(original)
+++
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
Mon Sep 10 11:38:01 2012
@@ -34,7 +34,6 @@ import org.apache.droids.helper.factorie
import org.apache.droids.helper.factories.URLFiltersFactory;
import org.apache.droids.impl.DefaultTaskExceptionHandler;
import org.apache.droids.impl.SequentialTaskMaster;
-import org.apache.droids.impl.SysoutCrawlingDroid;
import org.apache.droids.net.RegexURLFilter;
import org.apache.droids.parse.html.HtmlParser;
import org.apache.droids.protocol.http.DroidsHttpClient;
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/SimpleRuntime.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/TestCrawlingWorker.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java?p2=incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/TestCrawlingWorker.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/robot/crawler/TestCrawlingWorker.java
(original)
+++
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java
Mon Sep 10 11:38:01 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.droids.robot.crawler;
+package org.apache.droids.examples;
import java.io.IOException;
import java.net.URI;
@@ -24,15 +24,17 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.LinkTask;
import org.apache.droids.api.ContentEntity;
import org.apache.droids.api.Link;
+import org.apache.droids.examples.DroidsFactory;
+import org.apache.droids.examples.SysoutCrawlingDroid;
import org.apache.droids.exception.DroidsException;
import org.apache.droids.helper.factories.ParserFactory;
import org.apache.droids.helper.factories.ProtocolFactory;
-import org.apache.droids.impl.SysoutCrawlingDroid;
import org.apache.droids.parse.html.HtmlParser;
+import org.apache.droids.robot.crawler.CrawlingDroid;
+import org.apache.droids.robot.crawler.CrawlingWorker;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestCrawlingWorker.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java
(from r1381505,
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleDroid.java)
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java?p2=incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java&p1=incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleDroid.java&r1=1381505&r2=1382765&rev=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleDroid.java
(original)
+++
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java
Mon Sep 10 11:38:01 2012
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.droids.impl;
+package org.apache.droids.examples;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
-import org.apache.droids.DroidsFactory;
import org.apache.droids.api.Droid;
import org.apache.droids.api.Link;
import org.apache.droids.api.TaskExceptionHandler;
import org.apache.droids.api.TaskExceptionResult;
import org.apache.droids.api.TaskMaster;
-import org.apache.droids.examples.handler.ReportHandler;
+import org.apache.droids.examples.DroidsFactory;
+import org.apache.droids.handle.ReportHandler;
import org.apache.droids.localserver.LocalHttpServer;
import org.apache.droids.localserver.ResourceHandler;
import org.junit.After;
Propchange:
incubator/droids/trunk/droids-examples/src/test/java/org/apache/droids/examples/TestSimpleDroid.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/droids/trunk/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml?rev=1382765&r1=1382764&r2=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
(original)
+++
incubator/droids/trunk/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
Mon Sep 10 11:38:01 2012
@@ -51,7 +51,7 @@
</bean>
<!-- Droids -->
- <bean name="org.apache.droids.api.Droid/hello"
+ <!--bean name="org.apache.droids.api.Droid/hello"
class="org.apache.droids.impl.SysoutCrawlingDroid">
<constructor-arg ref="java.util.LinkedList" />
<constructor-arg ref="taskMaster" />
@@ -59,7 +59,7 @@
<property name="protocolFactory"
ref="org.apache.droids.helper.factories.ProtocolFactory"/>
<property name="parserFactory"
ref="org.apache.droids.helper.factories.ParserFactory"/>
<property name="filtersFactory"
ref="org.apache.droids.helper.factories.URLFiltersFactory"/>
- </bean>
+ </bean-->
<!-- Queue -->
<bean id="java.util.LinkedList"
class="java.util.LinkedList">
Modified:
incubator/droids/trunk/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java?rev=1382765&r1=1382764&r2=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
(original)
+++
incubator/droids/trunk/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
Mon Sep 10 11:38:01 2012
@@ -24,11 +24,11 @@ import junit.framework.Assert;
import org.apache.droids.api.Droid;
import org.apache.droids.api.Link;
-import org.apache.droids.examples.handler.ReportHandler;
-import org.apache.droids.impl.ReportCrawlingDroid;
+import org.apache.droids.handle.ReportHandler;
import org.apache.droids.localserver.LocalHttpServer;
import org.apache.droids.localserver.ResourceHandler;
import org.apache.droids.robot.crawler.CrawlingDroid;
+import org.apache.droids.robot.crawler.ReportCrawlingDroid;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
Modified:
incubator/droids/trunk/droids-spring/src/test/resources/droids-core-test-context.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/src/test/resources/droids-core-test-context.xml?rev=1382765&r1=1382764&r2=1382765&view=diff
==============================================================================
---
incubator/droids/trunk/droids-spring/src/test/resources/droids-core-test-context.xml
(original)
+++
incubator/droids/trunk/droids-spring/src/test/resources/droids-core-test-context.xml
Mon Sep 10 11:38:01 2012
@@ -52,7 +52,7 @@
<!-- Droids -->
<bean name="org.apache.droids.api.Droid/report"
- class="org.apache.droids.impl.ReportCrawlingDroid">
+ class="org.apache.droids.robot.crawler.ReportCrawlingDroid">
<constructor-arg ref="java.util.LinkedList" />
<constructor-arg ref="taskMaster" />
