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 bc...@apache.org on 2011/02/09 20:46:33 UTC
svn commit: r1069081 - in /incubator/droids/branch/bchapuis: droids-core/
droids-core/src/test/java/org/apache/droids/examples/handler/
droids-crawler/ droids-crawler/src/main/java/org/apache/droids/crawler/
droids-crawler/src/test/java/org/apache/droi...
Author: bchapuis
Date: Wed Feb 9 20:46:32 2011
New Revision: 1069081
URL: http://svn.apache.org/viewvc?rev=1069081&view=rev
Log:
Made some modifications to the project structure.
Added:
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionReportHandler.java
- copied, changed from r1068864, incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportHandler.java
- copied, changed from r1068864, incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ReportHandler.java
incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleRuntime.java
- copied, changed from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SimpleRuntime.java
incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/TestSimpleDroid.java
- copied, changed from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleDroid.java
incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/TestSimpleQueue.java
- copied, changed from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleQueue.java
Removed:
incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ExceptionReportHandler.java
incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ReportHandler.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SimpleRuntime.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleDroid.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleQueue.java
Modified:
incubator/droids/branch/bchapuis/droids-core/pom.xml
incubator/droids/branch/bchapuis/droids-crawler/ (props changed)
incubator/droids/branch/bchapuis/droids-crawler/pom.xml
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/DroidsFactory.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionCrawlingDroid.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportCrawlingDroid.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SaveCrawlingDroid.java
incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SysoutCrawlingDroid.java
incubator/droids/branch/bchapuis/droids-spring/pom.xml
incubator/droids/branch/bchapuis/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
incubator/droids/branch/bchapuis/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
incubator/droids/branch/bchapuis/droids-spring/src/test/resources/droids-core-test-context.xml
incubator/droids/branch/bchapuis/droids-walker/ (props changed)
incubator/droids/branch/bchapuis/droids-walker/pom.xml
incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/FileRenameDroid.java
incubator/droids/branch/bchapuis/droids-wicket/pom.xml
Modified: incubator/droids/branch/bchapuis/droids-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-core/pom.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-core/pom.xml (original)
+++ incubator/droids/branch/bchapuis/droids-core/pom.xml Wed Feb 9 20:46:32 2011
@@ -26,68 +26,68 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>droids</artifactId>
- <groupId>org.apache.droids</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>droids-core</artifactId>
- <name>Droids Core</name>
- <inceptionYear>2007</inceptionYear>
- <description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>droids</artifactId>
+ <groupId>org.apache.droids</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>droids-core</artifactId>
+ <name>Droids Core</name>
+ <inceptionYear>2007</inceptionYear>
+ <description>
Droids API and core components
- </description>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <!-- export our test classes in a separate jar -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </description>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.droids</groupId>
- <artifactId>droids-norobots</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-norobots</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
<!-- TEST -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Propchange: incubator/droids/branch/bchapuis/droids-crawler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 9 20:46:32 2011
@@ -0,0 +1 @@
+target
Modified: incubator/droids/branch/bchapuis/droids-crawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/pom.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/pom.xml (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/pom.xml Wed Feb 9 20:46:32 2011
@@ -19,32 +19,43 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>droids</artifactId>
- <groupId>org.apache.droids</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>droids-crawler</artifactId>
- <name>Droids Crawler</name>
- <inceptionYear>2007</inceptionYear>
- <description>
- Droids Crawler
- </description>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.droids</groupId>
- <artifactId>droids-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>droids</artifactId>
+ <groupId>org.apache.droids</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>droids-crawler</artifactId>
+ <name>Droids Crawler</name>
+ <inceptionYear>2007</inceptionYear>
+ <description>
+ Droids Crawler
+ </description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
Modified: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/DroidsFactory.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/DroidsFactory.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/DroidsFactory.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/DroidsFactory.java Wed Feb 9 20:46:32 2011
@@ -36,13 +36,9 @@ import org.apache.droids.helper.factorie
import org.apache.droids.helper.factories.URLFiltersFactory;
import org.apache.droids.impl.DefaultTaskExceptionHandler;
import org.apache.droids.impl.TaskMasterImpl;
-import org.apache.droids.crawler.ExceptionCrawlingDroid;
-import org.apache.droids.crawler.ReportCrawlingDroid;
-import org.apache.droids.crawler.SaveCrawlingDroid;
import org.apache.droids.impl.SimpleTaskQueueWithHistory;
import org.apache.droids.parse.html.HtmlParser;
import org.apache.droids.protocol.http.HttpProtocol;
-import org.apache.droids.crawler.CrawlingDroid;
public class DroidsFactory
{
Modified: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionCrawlingDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionCrawlingDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionCrawlingDroid.java Wed Feb 9 20:46:32 2011
@@ -19,14 +19,14 @@
package org.apache.droids.crawler;
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;
import org.apache.droids.api.Worker;
-import org.apache.droids.examples.handler.ExceptionReportHandler;
import org.apache.droids.crawler.CrawlingDroid;
import org.apache.droids.crawler.CrawlingWorker;
+import org.apache.droids.crawler.DroidsFactory;
+import org.apache.droids.crawler.ExceptionReportHandler;
public class ExceptionCrawlingDroid extends CrawlingDroid {
Copied: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionReportHandler.java (from r1068864, incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ExceptionReportHandler.java)
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionReportHandler.java?p2=incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionReportHandler.java&p1=incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ExceptionReportHandler.java&r1=1068864&r2=1069081&rev=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ExceptionReportHandler.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ExceptionReportHandler.java Wed Feb 9 20:46:32 2011
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.examples.handler;
+package org.apache.droids.crawler;
import java.io.IOException;
import java.net.URI;
import org.apache.droids.api.ContentEntity;
+import org.apache.droids.crawler.ReportHandler;
import org.apache.droids.exception.DroidsException;
public class ExceptionReportHandler extends ReportHandler {
Modified: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportCrawlingDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportCrawlingDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportCrawlingDroid.java Wed Feb 9 20:46:32 2011
@@ -19,13 +19,9 @@
package org.apache.droids.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.crawler.CrawlingDroid;
-import org.apache.droids.crawler.CrawlingWorker;
public class ReportCrawlingDroid extends CrawlingDroid {
Copied: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportHandler.java (from r1068864, incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ReportHandler.java)
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportHandler.java?p2=incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportHandler.java&p1=incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ReportHandler.java&r1=1068864&r2=1069081&rev=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-core/src/test/java/org/apache/droids/examples/handler/ReportHandler.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/ReportHandler.java Wed Feb 9 20:46:32 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.droids.examples.handler;
+package org.apache.droids.crawler;
import java.io.IOException;
import java.net.URI;
Modified: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SaveCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SaveCrawlingDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SaveCrawlingDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SaveCrawlingDroid.java Wed Feb 9 20:46:32 2011
@@ -19,13 +19,13 @@
package org.apache.droids.crawler;
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;
import org.apache.droids.api.Worker;
import org.apache.droids.crawler.CrawlingDroid;
import org.apache.droids.crawler.CrawlingWorker;
+import org.apache.droids.crawler.DroidsFactory;
public class SaveCrawlingDroid extends CrawlingDroid {
private final Handler defaultHandler;
Modified: incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SysoutCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SysoutCrawlingDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SysoutCrawlingDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SysoutCrawlingDroid.java Wed Feb 9 20:46:32 2011
@@ -19,13 +19,13 @@
package org.apache.droids.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.handle.SysoutHandler;
import org.apache.droids.crawler.CrawlingDroid;
import org.apache.droids.crawler.CrawlingWorker;
+import org.apache.droids.crawler.DroidsFactory;
+import org.apache.droids.handle.SysoutHandler;
public class SysoutCrawlingDroid extends CrawlingDroid {
Copied: incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleRuntime.java (from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SimpleRuntime.java)
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleRuntime.java?p2=incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleRuntime.java&p1=incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SimpleRuntime.java&r1=1068864&r2=1069081&rev=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/SimpleRuntime.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleRuntime.java Wed Feb 9 20:46:32 2011
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.droids.crawler.CrawlingDroid;
import org.apache.droids.api.Link;
+import org.apache.droids.crawler.CrawlingDroid;
import org.apache.droids.delay.SimpleDelayTimer;
import org.apache.droids.handle.SysoutHandler;
import org.apache.droids.helper.factories.DroidFactory;
@@ -34,7 +35,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.TaskMasterImpl;
-import org.apache.droids.crawler.SysoutCrawlingDroid;
import org.apache.droids.net.RegexURLFilter;
import org.apache.droids.parse.html.HtmlParser;
import org.apache.droids.protocol.http.DroidsHttpClient;
Copied: incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/TestSimpleDroid.java (from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleDroid.java)
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/TestSimpleDroid.java?p2=incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/TestSimpleDroid.java&p1=incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleDroid.java&r1=1068864&r2=1069081&rev=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-crawler/src/test/java/org/apache/droids/crawler/TestSimpleDroid.java Wed Feb 9 20:46:32 2011
@@ -21,12 +21,10 @@ import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
-import org.apache.droids.crawler.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.examples.handler.ReportHandler;
import org.apache.droids.impl.TaskMasterImpl;
import org.apache.droids.localserver.LocalHttpServer;
import org.apache.droids.localserver.ResourceHandler;
Modified: incubator/droids/branch/bchapuis/droids-spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-spring/pom.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-spring/pom.xml (original)
+++ incubator/droids/branch/bchapuis/droids-spring/pom.xml Wed Feb 9 20:46:32 2011
@@ -41,6 +41,16 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-crawler</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-walker</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: incubator/droids/branch/bchapuis/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml (original)
+++ incubator/droids/branch/bchapuis/droids-spring/src/main/resources/org/apache/droids/dynamic/droids-core-context.xml Wed Feb 9 20:46:32 2011
@@ -52,7 +52,7 @@
<!-- Droids -->
<bean name="org.apache.droids.api.Droid/hello"
- class="org.apache.droids.impl.SysoutCrawlingDroid">
+ class="org.apache.droids.crawler.SysoutCrawlingDroid">
<constructor-arg ref="java.util.LinkedList" />
<constructor-arg ref="taskMaster" />
Modified: incubator/droids/branch/bchapuis/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-spring/src/test/java/org/apache/droids/dynamic/TestSimpleDroid.java Wed Feb 9 20:46:32 2011
@@ -24,7 +24,7 @@ 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.crawler.ReportHandler;
import org.apache.droids.crawler.ReportCrawlingDroid;
import org.apache.droids.localserver.LocalHttpServer;
import org.apache.droids.localserver.ResourceHandler;
Modified: incubator/droids/branch/bchapuis/droids-spring/src/test/resources/droids-core-test-context.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-spring/src/test/resources/droids-core-test-context.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-spring/src/test/resources/droids-core-test-context.xml (original)
+++ incubator/droids/branch/bchapuis/droids-spring/src/test/resources/droids-core-test-context.xml Wed Feb 9 20:46:32 2011
@@ -52,7 +52,7 @@
<!-- Droids -->
<bean name="org.apache.droids.api.Droid/report"
- class="org.apache.droids.impl.ReportCrawlingDroid">
+ class="org.apache.droids.crawler.ReportCrawlingDroid">
<constructor-arg ref="java.util.LinkedList" />
<constructor-arg ref="taskMaster" />
Propchange: incubator/droids/branch/bchapuis/droids-walker/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 9 20:46:32 2011
@@ -0,0 +1 @@
+target
Modified: incubator/droids/branch/bchapuis/droids-walker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-walker/pom.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-walker/pom.xml (original)
+++ incubator/droids/branch/bchapuis/droids-walker/pom.xml Wed Feb 9 20:46:32 2011
@@ -19,32 +19,36 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>droids</artifactId>
- <groupId>org.apache.droids</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>droids-walker</artifactId>
- <name>Droids Walker</name>
- <inceptionYear>2007</inceptionYear>
- <description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>droids</artifactId>
+ <groupId>org.apache.droids</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>droids-walker</artifactId>
+ <name>Droids Walker</name>
+ <inceptionYear>2007</inceptionYear>
+ <description>
Droids Walker
- </description>
- <packaging>jar</packaging>
+ </description>
+ <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.droids</groupId>
- <artifactId>droids-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/FileRenameDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/FileRenameDroid.java?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/FileRenameDroid.java (original)
+++ incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/FileRenameDroid.java Wed Feb 9 20:46:32 2011
@@ -22,17 +22,17 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Queue;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.droids.AbstractDroid;
import org.apache.droids.api.*;
import org.apache.droids.impl.TaskMasterImpl;
-import org.apache.droids.walker.FileTask;
-import org.apache.log4j.Logger;
public class FileRenameDroid extends AbstractDroid<FileTask>
{
- static final Logger log = Logger.getLogger( FileRenameDroid.class );
+ static final Log log = LogFactory.getLog(FileRenameDroid.class);
private Collection<File> initialFiles;
Copied: incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/TestSimpleQueue.java (from r1068864, incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleQueue.java)
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/TestSimpleQueue.java?p2=incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/TestSimpleQueue.java&p1=incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleQueue.java&r1=1068864&r2=1069081&rev=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-crawler/src/main/java/org/apache/droids/crawler/TestSimpleQueue.java (original)
+++ incubator/droids/branch/bchapuis/droids-walker/src/test/java/org/apache/droids/walker/TestSimpleQueue.java Wed Feb 9 20:46:32 2011
@@ -1,3 +1,5 @@
+package org.apache.droids.walker;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.droids.crawler;
+
import java.io.File;
@@ -22,7 +24,6 @@ import junit.framework.Assert;
import org.apache.droids.exception.InvalidTaskException;
import org.apache.droids.impl.MaxDepthTaskValidator;
-import org.apache.droids.walker.FileTask;
import org.junit.Test;
public class TestSimpleQueue
Modified: incubator/droids/branch/bchapuis/droids-wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branch/bchapuis/droids-wicket/pom.xml?rev=1069081&r1=1069080&r2=1069081&view=diff
==============================================================================
--- incubator/droids/branch/bchapuis/droids-wicket/pom.xml (original)
+++ incubator/droids/branch/bchapuis/droids-wicket/pom.xml Wed Feb 9 20:46:32 2011
@@ -19,43 +19,53 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>droids</artifactId>
- <groupId>org.apache.droids</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>droids-wicket</artifactId>
- <name>Droids Wicket</name>
- <inceptionYear>2007</inceptionYear>
- <description>Droids Wicket</description>
- <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>droids</artifactId>
+ <groupId>org.apache.droids</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>droids-wicket</artifactId>
+ <name>Droids Wicket</name>
+ <inceptionYear>2007</inceptionYear>
+ <description>Droids Wicket</description>
+ <packaging>jar</packaging>
- <dependencies>
+ <dependencies>
<!-- DROIDS DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.droids</groupId>
- <artifactId>droids-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-crawler</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-walker</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<!-- WICKET DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
- <type>jar</type>
- <scope>compile</scope>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
<!--
<exclusions>
<exclusion>
@@ -64,7 +74,7 @@ limitations under the License.
</exclusion>
</exclusions>
-->
- </dependency>
+ </dependency>
<!-- OPTIONAL
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -73,106 +83,106 @@ limitations under the License.
</dependency>
-->
<!-- UTIL -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
<!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
<!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalProjectnatures>
- <projectnature>wicketbench.wicketnature</projectnature>
- </additionalProjectnatures>
- <additionalBuildcommands>
- <buildcommand>wicketbench.associatedMarkupAuditor</buildcommand>
- </additionalBuildcommands>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <additionalProjectnatures>
+ <projectnature>wicketbench.wicketnature</projectnature>
+ </additionalProjectnatures>
+ <additionalBuildcommands>
+ <buildcommand>wicketbench.associatedMarkupAuditor</buildcommand>
+ </additionalBuildcommands>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <properties>
- <wicket.version>1.4-rc1</wicket.version>
- <jetty.version>6.1.4</jetty.version>
- </properties>
+ <properties>
+ <wicket.version>1.4-rc1</wicket.version>
+ <jetty.version>6.1.4</jetty.version>
+ </properties>
</project>
\ No newline at end of file