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/03/09 10:10:45 UTC
svn commit: r1079724 - in /incubator/droids/trunk: ./ droids-core/
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/helper/
droids-core/src/main/java/org/apache...
Author: bchapuis
Date: Wed Mar 9 10:10:44 2011
New Revision: 1079724
URL: http://svn.apache.org/viewvc?rev=1079724&view=rev
Log:
DROIDS-116: replacing common logging by slf4j-api.
Modified:
incubator/droids/trunk/droids-core/pom.xml
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/ (props changed)
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/AbstractDroid.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/ (props changed)
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SaveHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/WriterHandler.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/ (props changed)
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/Loggable.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/StAX.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/ (props changed)
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/GenericFactory.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/ (props changed)
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/net/RegexURLFilter.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/ (props changed)
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/http/ (props changed)
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/robot/crawler/ (props changed)
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/ (props changed)
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileWorker.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/ (props changed)
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/localserver/LocalHttpServer.java
incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/ (props changed)
incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaDocumentParser.java
incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaHtmlParser.java
incubator/droids/trunk/droids-wicket/ (props changed)
incubator/droids/trunk/droids-wicket/pom.xml
incubator/droids/trunk/pom.xml
Modified: incubator/droids/trunk/droids-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/pom.xml?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/pom.xml (original)
+++ incubator/droids/trunk/droids-core/pom.xml Wed Mar 9 10:10:44 2011
@@ -39,7 +39,7 @@
<description>
Droids API and core components
</description>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
<build>
<plugins>
@@ -67,7 +67,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -81,13 +81,12 @@
<artifactId>guava</artifactId>
<version>r07</version>
</dependency>
-
- <!-- TEST -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
+
+ <!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -99,6 +98,12 @@
<version>1.8.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+AbstractDroid.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -20,13 +20,15 @@ import org.apache.droids.api.Droid;
import org.apache.droids.api.Task;
import org.apache.droids.api.TaskMaster;
import org.apache.droids.api.TaskQueue;
-import org.apache.droids.helper.Loggable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manage common tasks in standard Droids
*/
-public abstract class AbstractDroid<T extends Task> extends Loggable implements Droid<T>
+public abstract class AbstractDroid<T extends Task> implements Droid<T>
{
+ protected final Logger log = LoggerFactory.getLogger(AbstractDroid.class);
protected final TaskQueue<T> queue;
protected final TaskMaster<T> taskMaster;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+WriterHandler.java.original~
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SaveHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SaveHandler.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SaveHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/SaveHandler.java Wed Mar 9 10:10:44 2011
@@ -28,6 +28,8 @@ import java.net.URI;
import org.apache.droids.api.ContentEntity;
import org.apache.droids.api.Handler;
import org.apache.droids.helper.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handler which is writing the stream to the file system.
@@ -40,6 +42,9 @@ import org.apache.droids.helper.FileUtil
*
*/
public class SaveHandler extends WriterHandler implements Handler {
+
+ private final Logger log = LoggerFactory.getLogger(SaveHandler.class);
+
private String outputDir;
private URI uri;
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/WriterHandler.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/WriterHandler.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/WriterHandler.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/handle/WriterHandler.java Wed Mar 9 10:10:44 2011
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-import org.apache.droids.helper.Loggable;
-
/**
* Wrapper that allows you to pipe a stream from a reader to a writer via a
* buffer
@@ -29,7 +27,7 @@ import org.apache.droids.helper.Loggable
* @version 1.0
*
*/
-public class WriterHandler extends Loggable {
+public class WriterHandler {
private static final int BUFFER_SIZE = 1024;
@@ -51,4 +49,4 @@ public class WriterHandler extends Logga
writer.flush();
}
-}
\ No newline at end of file
+}
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1,2 @@
+Loggable.java.original~
+StAX.java.original~
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/Loggable.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/Loggable.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/Loggable.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/Loggable.java Wed Mar 9 10:10:44 2011
@@ -1,34 +0,0 @@
-/*
- * 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.helper;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Simple wrapper class to easier debug/log.
- *
- * @version 1.0
- */
-public class Loggable {
-
- protected final Log log = LogFactory.getLog(this.getClass());
-
- protected Loggable() {
-
- }
-}
\ No newline at end of file
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/StAX.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/StAX.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/StAX.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/StAX.java Wed Mar 9 10:10:44 2011
@@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamWriter;
* @version 1.0
*
*/
-public class StAX extends Loggable {
+public class StAX {
private XMLOutputFactory outputFactory = null;
private XMLEventFactory eventFactory = null;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+GenericFactory.java.original~
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/GenericFactory.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/GenericFactory.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/GenericFactory.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/helper/factories/GenericFactory.java Wed Mar 9 10:10:44 2011
@@ -18,8 +18,6 @@ package org.apache.droids.helper.factori
import java.util.Map;
-import org.apache.droids.helper.Loggable;
-
/**
* Basically all factories till now extend this generic factory. The core is a
* simple Map.
@@ -27,7 +25,7 @@ import org.apache.droids.helper.Loggable
* @version 1.0
*
*/
-public class GenericFactory<T> extends Loggable {
+public class GenericFactory<T> {
private Map<String,T> map = null;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+SequentialTaskMaster.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -27,11 +27,12 @@ import org.apache.droids.api.TaskExcepti
import org.apache.droids.api.TaskMaster;
import org.apache.droids.api.TaskQueue;
import org.apache.droids.api.Worker;
-import org.apache.droids.helper.Loggable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class SequentialTaskMaster<T extends Task>
- extends Loggable implements TaskMaster<T>
+public class SequentialTaskMaster<T extends Task> implements TaskMaster<T>
{
+ private final Logger log = LoggerFactory.getLogger(SequentialTaskMaster.class);
private final Object mutex;
private volatile boolean completed;
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -26,7 +26,9 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.droids.api.URLFilter;
-import org.apache.droids.helper.Loggable;
+import org.apache.droids.handle.SaveHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Regular expression implementation of an UrlFilter. Evaluates the url based on
@@ -35,7 +37,10 @@ import org.apache.droids.helper.Loggable
* @version 1.0
*
*/
-public class RegexURLFilter extends Loggable implements URLFilter {
+public class RegexURLFilter implements URLFilter {
+
+ private final Logger log = LoggerFactory.getLogger(SaveHandler.class);
+
/** An array of applicable rules */
private final List<RegexRule> rules;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+HtmlParser.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -29,11 +29,12 @@ import org.apache.droids.api.Parse;
import org.apache.droids.api.Parser;
import org.apache.droids.exception.ContentFormatViolationException;
import org.apache.droids.exception.DroidsException;
-import org.apache.droids.helper.Loggable;
import org.apache.droids.parse.ParseImpl;
import org.apache.xerces.xni.parser.XMLDocumentFilter;
import org.cyberneko.html.filters.ElementRemover;
import org.cyberneko.html.parsers.SAXParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
@@ -43,7 +44,9 @@ import org.xml.sax.SAXNotSupportedExcept
* @version 1.0
*
*/
-public class HtmlParser extends Loggable implements Parser {
+public class HtmlParser implements Parser {
+
+ private final Logger log = LoggerFactory.getLogger(HtmlParser.class);
private Map<String, String> elements= null;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+HttpProtocol.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
import org.apache.droids.api.ManagedContentEntity;
import org.apache.droids.api.Protocol;
-import org.apache.droids.helper.Loggable;
import org.apache.droids.norobots.ContentLoader;
import org.apache.droids.norobots.NoRobotClient;
import org.apache.droids.norobots.NoRobotException;
@@ -35,12 +34,16 @@ import org.apache.http.client.HttpClient
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.params.CoreProtocolPNames;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Protocol handler based on HttpClient 4.0.
*/
-public class HttpProtocol extends Loggable implements Protocol {
-
+public class HttpProtocol implements Protocol {
+
+ private final Logger log = LoggerFactory.getLogger(HttpProtocol.class);
+
private final HttpClient httpclient;
private final ContentLoader contentLoader;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+CrawlingWorker.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -30,12 +30,16 @@ import org.apache.droids.api.Parser;
import org.apache.droids.api.Protocol;
import org.apache.droids.api.Worker;
import org.apache.droids.exception.DroidsException;
-import org.apache.droids.helper.Loggable;
import org.apache.droids.helper.factories.HandlerFactory;
import org.apache.droids.helper.factories.URLFiltersFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class CrawlingWorker extends Loggable implements Worker<Link>
+public class CrawlingWorker implements Worker<Link>
{
+
+ private final Logger log = LoggerFactory.getLogger(CrawlingWorker.class);
+
private final CrawlingDroid droid;
HandlerFactory handlerFactory;
Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+FileWorker.java.original~
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=1079724&r1=1079723&r2=1079724&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 Wed Mar 9 10:10:44 2011
@@ -21,10 +21,13 @@ import java.io.File;
import org.apache.droids.api.TaskQueue;
import org.apache.droids.api.Worker;
import org.apache.droids.exception.InvalidTaskException;
-import org.apache.droids.helper.Loggable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class FileWorker extends Loggable implements Worker<FileTask>
+public class FileWorker implements Worker<FileTask>
{
+ private final Logger log = LoggerFactory.getLogger(FileWorker.class);
+
final TaskQueue<FileTask> queue;
public FileWorker( TaskQueue<FileTask> queue )
@@ -50,4 +53,4 @@ public class FileWorker extends Loggable
}
}
}
-}
\ No newline at end of file
+}
Propchange: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1 @@
+FileRenameDroid.java.original~
Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java (original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java Wed Mar 9 10:10:44 2011
@@ -29,12 +29,13 @@ import org.apache.droids.exception.Inval
import org.apache.droids.robot.walker.FileTask;
import org.apache.droids.impl.MultiThreadedTaskMaster;
import org.apache.droids.impl.SimpleTaskQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FileRenameDroid extends AbstractDroid<FileTask>
{
- static final Logger log = Logger.getLogger( FileRenameDroid.class );
+ private static final Logger log = LoggerFactory.getLogger(FileRenameDroid.class);
private Collection<File> initialFiles;
Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/localserver/LocalHttpServer.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/localserver/LocalHttpServer.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/localserver/LocalHttpServer.java (original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/localserver/LocalHttpServer.java Wed Mar 9 10:10:44 2011
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.Atomi
import com.google.common.base.Preconditions;
-import org.apache.droids.helper.Loggable;
import org.apache.http.HttpException;
import org.apache.http.HttpServerConnection;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
@@ -48,45 +47,43 @@ import org.apache.http.protocol.Response
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Local HTTP server for tests that require one.
*/
-public class LocalHttpServer extends Loggable
+public class LocalHttpServer
{
+ private final Logger log = LoggerFactory.getLogger(LocalHttpServer.class);
/**
* The local address to bind to. The host is an IP number rather than
* "localhost" to avoid surprises on hosts that map "localhost" to an IPv6
* address or something else. The port is 0 to let the system pick one.
*/
public final static InetSocketAddress TEST_SERVER_ADDR = new InetSocketAddress("127.0.0.1", 0);
-
/** The request handler registry. */
private final HttpRequestHandlerRegistry handlerRegistry;
-
/**
* The HTTP processor. If the interceptors are thread safe and the list is not
* modified during operation, the processor is thread safe.
*/
private final BasicHttpProcessor httpProcessor;
-
/** The server parameters. */
private final HttpParams params;
-
/** The server socket, while being served. */
private volatile ServerSocket servicedSocket;
-
/** The request listening thread, while listening. */
private volatile Thread listenerThread;
-
/** The number of connections this accepted. */
private final AtomicInteger acceptedConnections = new AtomicInteger(0);
/**
* Creates a new test server.
*/
- public LocalHttpServer() {
+ public LocalHttpServer()
+ {
this.handlerRegistry = new HttpRequestHandlerRegistry();
this.httpProcessor = new BasicHttpProcessor();
this.httpProcessor.addInterceptor(new ResponseDate());
@@ -94,17 +91,14 @@ public class LocalHttpServer extends Log
this.httpProcessor.addInterceptor(new ResponseContent());
this.httpProcessor.addInterceptor(new ResponseConnControl());
this.params = new BasicHttpParams();
- this.params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
- .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "LocalTestServer/1.1");
+ this.params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000).setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024).setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false).setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true).setParameter(CoreProtocolPNames.ORIGIN_SERVER, "LocalTestServer/1.1");
}
/**
* Returns the number of connections this test server has accepted.
*/
- public int getAcceptedConnectionCount() {
+ public int getAcceptedConnectionCount()
+ {
return this.acceptedConnections.get();
}
@@ -116,7 +110,8 @@ public class LocalHttpServer extends Log
* @param handler
* the handler to apply
*/
- public void register(String pattern, HttpRequestHandler handler) {
+ public void register(String pattern, HttpRequestHandler handler)
+ {
this.handlerRegistry.register(pattern, handler);
}
@@ -126,7 +121,8 @@ public class LocalHttpServer extends Log
* @param pattern
* the URL pattern
*/
- public void unregister(String pattern) {
+ public void unregister(String pattern)
+ {
this.handlerRegistry.unregister(pattern);
}
@@ -134,7 +130,8 @@ public class LocalHttpServer extends Log
* Starts this test server. Use {@link #getServicePort getServicePort} to
* obtain the port number afterwards.
*/
- public void start() throws IOException {
+ public void start() throws IOException
+ {
if (servicedSocket != null) {
return; // Already running
}
@@ -152,18 +149,17 @@ public class LocalHttpServer extends Log
/**
* Stops this test server.
*/
- public void stop() throws IOException {
+ public void stop() throws IOException
+ {
if (this.servicedSocket == null) {
return; // not running
}
-
+
try {
this.servicedSocket.close();
- }
- catch (IOException ex) {
+ } catch (IOException ex) {
log.error(ex.getMessage(), ex);
- }
- finally {
+ } finally {
this.servicedSocket = null;
}
@@ -174,7 +170,8 @@ public class LocalHttpServer extends Log
}
@Override
- public String toString() {
+ public String toString()
+ {
ServerSocket ssock = servicedSocket; // avoid synchronization
StringBuffer sb = new StringBuffer(80);
sb.append("LocalTestServer/");
@@ -191,9 +188,10 @@ public class LocalHttpServer extends Log
*
* @return the service port
*/
- public int getServicePort() {
+ public int getServicePort()
+ {
ServerSocket ssock = this.servicedSocket; // avoid synchronization
- Preconditions.checkState(ssock != null, "not running" );
+ Preconditions.checkState(ssock != null, "not running");
return ssock.getLocalPort();
}
@@ -202,9 +200,10 @@ public class LocalHttpServer extends Log
*
* @return the service address
*/
- public SocketAddress getServiceAddress() {
+ public SocketAddress getServiceAddress()
+ {
ServerSocket ssock = this.servicedSocket; // avoid synchronization
- Preconditions.checkState(ssock != null, "not running" );
+ Preconditions.checkState(ssock != null, "not running");
return ssock.getLocalSocketAddress();
}
@@ -218,19 +217,20 @@ public class LocalHttpServer extends Log
/** The workers launched from here. */
private final Set<Thread> workerThreads;
- public RequestListener() {
+ public RequestListener()
+ {
super();
this.workerThreads = Collections.synchronizedSet(new HashSet<Thread>());
}
-
- public void run() {
+
+ public void run()
+ {
try {
while ((servicedSocket != null) && (listenerThread == Thread.currentThread())
- && !Thread.interrupted()) {
+ && !Thread.interrupted()) {
try {
accept();
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
ServerSocket ssock = servicedSocket;
if ((ssock != null) && !ssock.isClosed()) {
log.error(LocalHttpServer.this.toString() + " could not accept", ex);
@@ -239,13 +239,13 @@ public class LocalHttpServer extends Log
break;
}
}
- }
- finally {
+ } finally {
cleanup();
}
}
- protected void accept() throws IOException {
+ protected void accept() throws IOException
+ {
// Set up HTTP connection
Socket socket = servicedSocket.accept();
acceptedConnections.incrementAndGet();
@@ -254,7 +254,7 @@ public class LocalHttpServer extends Log
// Set up the HTTP service
HttpService httpService = new HttpService(httpProcessor,
- new DefaultConnectionReuseStrategy(), new DefaultHttpResponseFactory());
+ new DefaultConnectionReuseStrategy(), new DefaultHttpResponseFactory());
httpService.setParams(params);
httpService.setHandlerResolver(handlerRegistry);
@@ -266,11 +266,13 @@ public class LocalHttpServer extends Log
}
- protected void cleanup() {
+ protected void cleanup()
+ {
Thread[] threads = workerThreads.toArray(new Thread[0]);
for (int i = 0; i < threads.length; i++) {
- if (threads[i] != null)
+ if (threads[i] != null) {
threads[i].interrupt();
+ }
}
}
@@ -281,40 +283,34 @@ public class LocalHttpServer extends Log
{
private final HttpService httpservice;
-
private final HttpServerConnection conn;
- public Worker(final HttpService httpservice, final HttpServerConnection conn) {
+ public Worker(final HttpService httpservice, final HttpServerConnection conn)
+ {
this.httpservice = httpservice;
this.conn = conn;
}
- public void run() {
+ public void run()
+ {
HttpContext context = new BasicHttpContext(null);
try {
while ((servicedSocket != null) && this.conn.isOpen() && !Thread.interrupted()) {
this.httpservice.handleRequest(this.conn, context);
}
- }
- catch (IOException ex) {
+ } catch (IOException ex) {
// ignore silently
- }
- catch (HttpException ex) {
+ } catch (HttpException ex) {
// ignore silently
- }
- finally {
+ } finally {
workerThreads.remove(Thread.currentThread());
try {
this.conn.shutdown();
- }
- catch (IOException ignore) {
+ } catch (IOException ignore) {
}
}
}
-
}
-
}
-
}
Propchange: incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -0,0 +1,2 @@
+TikaDocumentParser.java.original~
+TikaHtmlParser.java.original~
Modified: incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaDocumentParser.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaDocumentParser.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaDocumentParser.java (original)
+++ incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaDocumentParser.java Wed Mar 9 10:10:44 2011
@@ -26,7 +26,6 @@ import org.apache.droids.api.Link;
import org.apache.droids.api.Parse;
import org.apache.droids.api.Parser;
import org.apache.droids.exception.DroidsException;
-import org.apache.droids.helper.Loggable;
import org.apache.droids.parse.ParseImpl;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
@@ -35,7 +34,7 @@ import org.apache.tika.parser.ParseConte
import org.apache.tika.sax.BodyContentHandler;
import org.xml.sax.SAXException;
-public class TikaDocumentParser extends Loggable implements Parser {
+public class TikaDocumentParser implements Parser {
@Override
public Parse parse(ContentEntity entity, Link link) throws DroidsException,
Modified: incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaHtmlParser.java?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaHtmlParser.java (original)
+++ incubator/droids/trunk/droids-tika/src/main/java/org/apache/droids/tika/TikaHtmlParser.java Wed Mar 9 10:10:44 2011
@@ -1,81 +1,80 @@
-/*
- * 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.tika;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.droids.api.ContentEntity;
-import org.apache.droids.api.Link;
-import org.apache.droids.api.Parse;
-import org.apache.droids.api.Parser;
-import org.apache.droids.exception.DroidsException;
-import org.apache.droids.helper.Loggable;
-import org.apache.droids.parse.ParseImpl;
-import org.apache.droids.parse.html.LinkExtractor;
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.AutoDetectParser;
-import org.apache.tika.sax.TeeContentHandler;
-import org.xml.sax.SAXException;
-
-public class TikaHtmlParser extends Loggable implements Parser {
-
- private Map<String, String> elements= null;
-
- public Map<String, String> getElements() {
- if (elements == null) {
- elements = new HashMap<String, String>();
- }
- return elements;
- }
-
- public void setElements(Map<String, String> elements) {
- this.elements = elements;
- }
-
- @Override
- public Parse parse(ContentEntity entity, Link link) throws IOException, DroidsException {
- // Init Tika objects
- org.apache.tika.parser.Parser parser = new AutoDetectParser();
- Metadata metadata = new Metadata();
-
- String charset = entity.getCharset();
- if (charset == null) {
- charset = "UTF-8";
- }
- EchoHandler data = new EchoHandler(charset);
- LinkExtractor extractor = new LinkExtractor(link, elements);
-
- TeeContentHandler parallelHandler = new TeeContentHandler(data, extractor);
-
- InputStream instream = entity.obtainContent();
- try {
- parser.parse(instream, parallelHandler, metadata);
-
- return new ParseImpl(data.toString(), extractor.getLinks());
- } catch (SAXException ex) {
- throw new DroidsException("Failure parsing document " + link.getId(), ex);
- } catch (TikaException ex) {
- throw new DroidsException("Failure parsing document " + link.getId(), ex);
- } finally {
- instream.close();
- }
- }
-}
+/*
+ * 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.tika;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.droids.api.ContentEntity;
+import org.apache.droids.api.Link;
+import org.apache.droids.api.Parse;
+import org.apache.droids.api.Parser;
+import org.apache.droids.exception.DroidsException;
+import org.apache.droids.parse.ParseImpl;
+import org.apache.droids.parse.html.LinkExtractor;
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.sax.TeeContentHandler;
+import org.xml.sax.SAXException;
+
+public class TikaHtmlParser implements Parser {
+
+ private Map<String, String> elements= null;
+
+ public Map<String, String> getElements() {
+ if (elements == null) {
+ elements = new HashMap<String, String>();
+ }
+ return elements;
+ }
+
+ public void setElements(Map<String, String> elements) {
+ this.elements = elements;
+ }
+
+ @Override
+ public Parse parse(ContentEntity entity, Link link) throws IOException, DroidsException {
+ // Init Tika objects
+ org.apache.tika.parser.Parser parser = new AutoDetectParser();
+ Metadata metadata = new Metadata();
+
+ String charset = entity.getCharset();
+ if (charset == null) {
+ charset = "UTF-8";
+ }
+ EchoHandler data = new EchoHandler(charset);
+ LinkExtractor extractor = new LinkExtractor(link, elements);
+
+ TeeContentHandler parallelHandler = new TeeContentHandler(data, extractor);
+
+ InputStream instream = entity.obtainContent();
+ try {
+ parser.parse(instream, parallelHandler, metadata);
+
+ return new ParseImpl(data.toString(), extractor.getLinks());
+ } catch (SAXException ex) {
+ throw new DroidsException("Failure parsing document " + link.getId(), ex);
+ } catch (TikaException ex) {
+ throw new DroidsException("Failure parsing document " + link.getId(), ex);
+ } finally {
+ instream.close();
+ }
+ }
+}
Propchange: incubator/droids/trunk/droids-wicket/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 9 10:10:44 2011
@@ -4,3 +4,4 @@ log.txt
bin
.settings
target
+pom.xml.original~
Modified: incubator/droids/trunk/droids-wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-wicket/pom.xml?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/droids-wicket/pom.xml (original)
+++ incubator/droids/trunk/droids-wicket/pom.xml Wed Mar 9 10:10:44 2011
@@ -86,13 +86,18 @@ limitations under the License.
<!-- LOGGING DEPENDENCIES - LOG4J -->
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.9</version>
</dependency>
<!-- JUNIT DEPENDENCY FOR TESTING -->
<dependency>
@@ -175,4 +180,4 @@ limitations under the License.
<jetty.version>6.1.4</jetty.version>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/droids/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=1079724&r1=1079723&r2=1079724&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Wed Mar 9 10:10:44 2011
@@ -120,6 +120,11 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-spring-configurator</artifactId>
<version>${spring-conf.version}</version>
@@ -213,33 +218,33 @@
<!-- apache gpg profile -->
<profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>