(no commit message)

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/AbstractPageRequest.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/AbstractPageRequest.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Action.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Action.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Action.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Action.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Configuration.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Configuration.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Configuration.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Configuration.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Crawler.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Crawler.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Crawler.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Crawler.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/GetPageRequest.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/GetPageRequest.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Page.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Page.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/Page.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/Page.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageException.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageException.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageException.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageException.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageRequest.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageRequest.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageRequest.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageRequest.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageType.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageType.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PageType.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PageType.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PostPageRequest.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/PostPageRequest.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ActionImpl.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ActionImpl.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ActionImpl.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ActionImpl.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/App.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/App.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/App.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/App.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigItem.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigItem.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigItem.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigItem.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationImpl.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationImpl.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationImpl.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationImpl.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationParser.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationParser.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/ConfigurationParser.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/ConfigurationParser.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/CrawlerImpl.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/CrawlerImpl.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/CrawlerImpl.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/CrawlerImpl.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/PageImpl.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageImpl.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/PageImpl.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageImpl.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/PageTypeConfig.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageTypeConfig.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/PageTypeConfig.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/PageTypeConfig.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/UrlConfig.java b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/UrlConfig.java
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/UrlConfig.java
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/UrlConfig.java

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/package.html b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/package.html
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/impl/package.html
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/impl/package.html

diff --git a/branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/package.html b/branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/package.html
similarity index 100%
rename from branches/TO_MAVEN/crawler/basic/src/org/wamblee/crawler/package.html
rename to branches/TO_MAVEN/crawler/basic/src/main/java/org/wamblee/crawler/package.html

diff --git a/branches/TO_MAVEN/pom.xml b/branches/TO_MAVEN/pom.xml
index cbf402e9a2914eea5f2cf2b63a95ff43520ad7d3..13366e67d395c32973dc38bd126d15f8ed3a190b 100644 (file)
--- a/branches/TO_MAVEN/pom.xml
+++ b/branches/TO_MAVEN/pom.xml
@@ -45,12 +45,34 @@
         <artifactId>socketproxy</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.wamblee</groupId>
+        <artifactId>crawler</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.wamblee</groupId>
+        <artifactId>crawler-basic</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>jtidy</groupId>
+        <artifactId>jtidy</artifactId>
+        <version>4aug2000r7-dev</version>
+      </dependency>
 
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.0.2</version>
       </dependency>
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>3.0</version>
+      </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>