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 to...@apache.org on 2012/12/04 16:55:47 UTC

svn commit: r1417032 - in /incubator/droids/branches/0.2.x-cleanup/droids-core: pom.xml src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java src/test/java/org/apache/droids/localserver/ src/test/java/org/apache/droids/robot/

Author: tobr
Date: Tue Dec  4 16:55:46 2012
New Revision: 1417032

URL: http://svn.apache.org/viewvc?rev=1417032&view=rev
Log:
cleaned up the pom

Removed:
    incubator/droids/branches/0.2.x-cleanup/droids-core/src/test/java/org/apache/droids/localserver/
    incubator/droids/branches/0.2.x-cleanup/droids-core/src/test/java/org/apache/droids/robot/
Modified:
    incubator/droids/branches/0.2.x-cleanup/droids-core/pom.xml
    incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java

Modified: incubator/droids/branches/0.2.x-cleanup/droids-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-core/pom.xml?rev=1417032&r1=1417031&r2=1417032&view=diff
==============================================================================
--- incubator/droids/branches/0.2.x-cleanup/droids-core/pom.xml (original)
+++ incubator/droids/branches/0.2.x-cleanup/droids-core/pom.xml Tue Dec  4 16:55:46 2012
@@ -41,23 +41,6 @@
   </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>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.droids</groupId>
@@ -65,28 +48,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <version>${nekohtml.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>10.0.1</version>
@@ -109,15 +70,9 @@
       <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.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java
URL: http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java?rev=1417032&r1=1417031&r2=1417032&view=diff
==============================================================================
--- incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java (original)
+++ incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/filter/AlreadyVisitedFilter.java Tue Dec  4 16:55:46 2012
@@ -22,7 +22,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.droids.core.Task;
-import org.apache.http.client.utils.URIUtils;
 
 /**
  * 
@@ -41,8 +40,7 @@ public class AlreadyVisitedFilter<T exte
   public Task filter(final T task) {
     try {
       URI uri = task.getURI();
-      URI key = URIUtils.createURI(
-          uri.getScheme(), uri.getHost(), uri.getPort(), uri.getPath(), null, null);
+      URI key = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), null, null);
       synchronized (this.visited)
       {
         if (!this.visited.contains(key)) {