fix #190

pom.xml

@@ -548,7 +548,7 @@
       <version>0.1.0</version>
     </dependency>
     <dependency>
-      <groupId>org.seasar.robot</groupId>
+      <groupId>org.codelibs.robot</groupId>
       <artifactId>s2-robot-db-${database}</artifactId>
       <version>${s2robot.version}</version>
       <exclusions>
@@ -559,7 +559,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.seasar.robot</groupId>
+      <groupId>org.codelibs.robot</groupId>
       <artifactId>s2-robot-db</artifactId>
       <version>${s2robot.version}</version>
     </dependency>

src/main/java/jp/sf/fess/action/IndexAction.java

@@ -83,6 +83,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.util.CharUtil;
 import org.codelibs.sastruts.core.SSCConstants;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
 import org.codelibs.solr.lib.exception.SolrLibQueryException;
@@ -93,7 +94,6 @@ import org.seasar.framework.container.annotation.tiger.InitMethod;
 import org.seasar.framework.util.InputStreamUtil;
 import org.seasar.framework.util.OutputStreamUtil;
 import org.seasar.framework.util.URLUtil;
-import org.seasar.robot.util.CharUtil;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 import org.seasar.struts.taglib.S2Functions;

src/main/java/jp/sf/fess/action/admin/DataAction.java

@@ -48,8 +48,8 @@ import jp.sf.fess.service.SearchLogService;
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.CoreLibConstants;
 import org.codelibs.core.util.DynamicProperties;
+import org.codelibs.robot.util.StreamUtil;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
-import org.seasar.robot.util.StreamUtil;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 import org.seasar.struts.exception.ActionMessagesException;

src/main/java/jp/sf/fess/action/admin/WizardAction.java

@@ -42,9 +42,9 @@ import jp.sf.fess.util.ComponentUtil;
 import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.util.CharUtil;
 import org.codelibs.sastruts.core.annotation.Token;
 import org.codelibs.sastruts.core.exception.SSCActionMessagesException;
-import org.seasar.robot.util.CharUtil;
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 import org.slf4j.Logger;

src/main/java/jp/sf/fess/db/exentity/CrawlingConfig.java

@@ -18,7 +18,7 @@ package jp.sf.fess.db.exentity;
 
 import java.util.Map;
 
-import org.seasar.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.client.S2RobotClientFactory;
 
 public interface CrawlingConfig {
 

src/main/java/jp/sf/fess/db/exentity/DataCrawlingConfig.java

@@ -37,13 +37,13 @@ import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.auth.DigestScheme;
 import org.apache.http.impl.auth.NTLMScheme;
 import org.codelibs.core.util.StringUtil;
-import org.seasar.robot.client.S2RobotClientFactory;
-import org.seasar.robot.client.http.Authentication;
-import org.seasar.robot.client.http.HcHttpClient;
-import org.seasar.robot.client.http.impl.AuthenticationImpl;
-import org.seasar.robot.client.http.ntlm.JcifsEngine;
-import org.seasar.robot.client.smb.SmbAuthentication;
-import org.seasar.robot.client.smb.SmbClient;
+import org.codelibs.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.client.http.Authentication;
+import org.codelibs.robot.client.http.HcHttpClient;
+import org.codelibs.robot.client.http.impl.AuthenticationImpl;
+import org.codelibs.robot.client.http.ntlm.JcifsEngine;
+import org.codelibs.robot.client.smb.SmbAuthentication;
+import org.codelibs.robot.client.smb.SmbClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -291,14 +291,14 @@ public class DataCrawlingConfig extends BsDataCrawlingConfig implements
         }
 
         // request header
-        final List<org.seasar.robot.client.http.RequestHeader> rhList = new ArrayList<org.seasar.robot.client.http.RequestHeader>();
+        final List<org.codelibs.robot.client.http.RequestHeader> rhList = new ArrayList<org.codelibs.robot.client.http.RequestHeader>();
         int count = 1;
         String headerName = paramMap.get(S2ROBOT_WEB_HEADER_PREFIX + count
                 + ".name");
         while (StringUtil.isNotBlank(headerName)) {
             final String headerValue = paramMap.get(S2ROBOT_WEB_HEADER_PREFIX
                     + count + ".value");
-            rhList.add(new org.seasar.robot.client.http.RequestHeader(
+            rhList.add(new org.codelibs.robot.client.http.RequestHeader(
                     headerName, headerValue));
             count++;
             headerName = paramMap.get(S2ROBOT_WEB_HEADER_PREFIX + count
@@ -307,7 +307,7 @@ public class DataCrawlingConfig extends BsDataCrawlingConfig implements
         if (!rhList.isEmpty()) {
             factoryParamMap
                     .put(HcHttpClient.REQUERT_HEADERS_PROPERTY,
-                            rhList.toArray(new org.seasar.robot.client.http.RequestHeader[rhList
+                            rhList.toArray(new org.codelibs.robot.client.http.RequestHeader[rhList
                                     .size()]));
         }
 

src/main/java/jp/sf/fess/db/exentity/FileCrawlingConfig.java

@@ -32,10 +32,10 @@ import jp.sf.fess.util.ComponentUtil;
 import jp.sf.fess.util.ParameterUtil;
 
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.client.smb.SmbAuthentication;
+import org.codelibs.robot.client.smb.SmbClient;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.client.S2RobotClientFactory;
-import org.seasar.robot.client.smb.SmbAuthentication;
-import org.seasar.robot.client.smb.SmbClient;
 
 /**
  * The entity of FILE_CRAWLING_CONFIG.

src/main/java/jp/sf/fess/db/exentity/RequestHeader.java

@@ -31,8 +31,8 @@ public class RequestHeader extends BsRequestHeader {
     /** Serial version UID. (Default) */
     private static final long serialVersionUID = 1L;
 
-    public org.seasar.robot.client.http.RequestHeader getS2RobotRequestHeader() {
-        return new org.seasar.robot.client.http.RequestHeader(getName(),
+    public org.codelibs.robot.client.http.RequestHeader getS2RobotRequestHeader() {
+        return new org.codelibs.robot.client.http.RequestHeader(getName(),
                 getValue());
     }
 }

src/main/java/jp/sf/fess/db/exentity/WebAuthentication.java

@@ -31,10 +31,10 @@ import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.auth.DigestScheme;
 import org.apache.http.impl.auth.NTLMScheme;
 import org.codelibs.core.util.StringUtil;
-import org.seasar.robot.RobotSystemException;
-import org.seasar.robot.client.http.Authentication;
-import org.seasar.robot.client.http.impl.AuthenticationImpl;
-import org.seasar.robot.client.http.ntlm.JcifsEngine;
+import org.codelibs.robot.RobotSystemException;
+import org.codelibs.robot.client.http.Authentication;
+import org.codelibs.robot.client.http.impl.AuthenticationImpl;
+import org.codelibs.robot.client.http.ntlm.JcifsEngine;
 
 /**
  * The entity of WEB_AUTHENTICATION.

src/main/java/jp/sf/fess/db/exentity/WebCrawlingConfig.java

@@ -31,10 +31,10 @@ import jp.sf.fess.service.WebAuthenticationService;
 import jp.sf.fess.util.ParameterUtil;
 
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.client.http.Authentication;
+import org.codelibs.robot.client.http.HcHttpClient;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.client.S2RobotClientFactory;
-import org.seasar.robot.client.http.Authentication;
-import org.seasar.robot.client.http.HcHttpClient;
 
 /**
  * The entity of WEB_CRAWLING_CONFIG.
@@ -239,12 +239,12 @@ public class WebCrawlingConfig extends BsWebCrawlingConfig implements
         // request header
         final List<RequestHeader> requestHeaderList = requestHeaderService
                 .getRequestHeaderList(getId());
-        final List<org.seasar.robot.client.http.RequestHeader> rhList = new ArrayList<org.seasar.robot.client.http.RequestHeader>();
+        final List<org.codelibs.robot.client.http.RequestHeader> rhList = new ArrayList<org.codelibs.robot.client.http.RequestHeader>();
         for (final RequestHeader requestHeader : requestHeaderList) {
             rhList.add(requestHeader.getS2RobotRequestHeader());
         }
         paramMap.put(HcHttpClient.REQUERT_HEADERS_PROPERTY, rhList
-                .toArray(new org.seasar.robot.client.http.RequestHeader[rhList
+                .toArray(new org.codelibs.robot.client.http.RequestHeader[rhList
                         .size()]));
 
     }

src/main/java/jp/sf/fess/dict/synonym/SynonymFile.java

@@ -38,7 +38,7 @@ import jp.sf.fess.dict.DictionaryFile;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.util.StringUtil;
-import org.seasar.robot.util.StreamUtil;
+import org.codelibs.robot.util.StreamUtil;
 
 public class SynonymFile extends DictionaryFile<SynonymItem> {
     private static final String SYNONYM = "synonym";

src/main/java/jp/sf/fess/dict/userdict/UserDictFile.java

@@ -39,7 +39,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.analysis.ja.util.CSVUtil;
 import org.codelibs.core.util.StringUtil;
-import org.seasar.robot.util.StreamUtil;
+import org.codelibs.robot.util.StreamUtil;
 
 public class UserDictFile extends DictionaryFile<UserDictItem> {
     private static final String USERDICT = "userDict";

src/main/java/jp/sf/fess/ds/DataStoreCrawlingException.java

@@ -16,7 +16,7 @@
 
 package jp.sf.fess.ds;
 
-import org.seasar.robot.RobotCrawlAccessException;
+import org.codelibs.robot.RobotCrawlAccessException;
 
 public class DataStoreCrawlingException extends RobotCrawlAccessException {
 

src/main/java/jp/sf/fess/ds/impl/CsvDataStoreImpl.java

@@ -39,9 +39,9 @@ import jp.sf.orangesignal.csv.CsvReader;
 
 import org.apache.commons.io.IOUtils;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.RobotCrawlAccessException;
+import org.codelibs.robot.RobotMultipleCrawlAccessException;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.RobotCrawlAccessException;
-import org.seasar.robot.RobotMultipleCrawlAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/ds/impl/FileListDataStoreImpl.java

@@ -30,21 +30,21 @@ import jp.sf.fess.ds.IndexUpdateCallback;
 import jp.sf.fess.helper.CrawlingSessionHelper;
 import jp.sf.orangesignal.csv.CsvConfig;
 
+import org.codelibs.robot.RobotSystemException;
+import org.codelibs.robot.builder.RequestDataBuilder;
+import org.codelibs.robot.client.S2RobotClient;
+import org.codelibs.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.entity.ResultData;
+import org.codelibs.robot.processor.ResponseProcessor;
+import org.codelibs.robot.processor.impl.DefaultResponseProcessor;
+import org.codelibs.robot.rule.Rule;
+import org.codelibs.robot.rule.RuleManager;
+import org.codelibs.robot.transformer.Transformer;
+import org.codelibs.robot.util.LruHashMap;
 import org.codelibs.solr.lib.SolrGroup;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.util.SerializeUtil;
-import org.seasar.robot.RobotSystemException;
-import org.seasar.robot.builder.RequestDataBuilder;
-import org.seasar.robot.client.S2RobotClient;
-import org.seasar.robot.client.S2RobotClientFactory;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.entity.ResultData;
-import org.seasar.robot.processor.ResponseProcessor;
-import org.seasar.robot.processor.impl.DefaultResponseProcessor;
-import org.seasar.robot.rule.Rule;
-import org.seasar.robot.rule.RuleManager;
-import org.seasar.robot.transformer.Transformer;
-import org.seasar.robot.util.LruHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/helper/CrawlingConfigHelper.java

@@ -40,13 +40,13 @@ import jp.sf.fess.service.WebCrawlingConfigService;
 import jp.sf.fess.util.ComponentUtil;
 
 import org.apache.commons.io.IOUtils;
+import org.codelibs.robot.builder.RequestDataBuilder;
+import org.codelibs.robot.client.S2RobotClient;
+import org.codelibs.robot.client.S2RobotClientFactory;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.util.StreamUtil;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.util.Base64Util;
-import org.seasar.robot.builder.RequestDataBuilder;
-import org.seasar.robot.client.S2RobotClient;
-import org.seasar.robot.client.S2RobotClientFactory;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.util.StreamUtil;
 import org.seasar.struts.util.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/jp/sf/fess/helper/RobotLogHelper.java

@@ -20,12 +20,12 @@ import jp.sf.fess.db.exentity.CrawlingConfig;
 import jp.sf.fess.service.FailureUrlService;
 import jp.sf.fess.util.ComponentUtil;
 
+import org.codelibs.robot.RobotMultipleCrawlAccessException;
+import org.codelibs.robot.S2RobotContext;
+import org.codelibs.robot.entity.UrlQueue;
+import org.codelibs.robot.helper.impl.LogHelperImpl;
+import org.codelibs.robot.log.LogType;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.RobotMultipleCrawlAccessException;
-import org.seasar.robot.S2RobotContext;
-import org.seasar.robot.entity.UrlQueue;
-import org.seasar.robot.helper.impl.LogHelperImpl;
-import org.seasar.robot.log.LogType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/helper/SearchLogHelper.java

@@ -32,10 +32,10 @@ import jp.sf.fess.db.exentity.SearchLog;
 import jp.sf.fess.db.exentity.customize.FavoriteUrlCount;
 
 import org.codelibs.core.util.DynamicProperties;
+import org.codelibs.robot.util.LruHashMap;
 import org.seasar.dbflute.cbean.ListResultBean;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.container.annotation.tiger.InitMethod;
-import org.seasar.robot.util.LruHashMap;
 
 public abstract class SearchLogHelper {
 

src/main/java/jp/sf/fess/helper/SystemHelper.java

@@ -44,13 +44,13 @@ import jp.sf.fess.util.ResourceUtil;
 import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.util.CharUtil;
 import org.codelibs.solr.lib.SolrGroup;
 import org.codelibs.solr.lib.policy.QueryType;
 import org.codelibs.solr.lib.policy.StatusPolicy;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.container.annotation.tiger.InitMethod;
 import org.seasar.framework.util.FileUtil;
-import org.seasar.robot.util.CharUtil;
 import org.seasar.struts.util.MessageResourcesUtil;
 import org.seasar.struts.util.RequestUtil;
 import org.seasar.struts.util.ServletContextUtil;

src/main/java/jp/sf/fess/helper/ViewHelper.java

@@ -44,9 +44,9 @@ import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.CoreLibConstants;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.util.CharUtil;
 import org.seasar.framework.container.annotation.tiger.InitMethod;
 import org.seasar.framework.util.URLUtil;
-import org.seasar.robot.util.CharUtil;
 import org.seasar.struts.taglib.S2Functions;
 import org.seasar.struts.util.MessageResourcesUtil;
 import org.seasar.struts.util.RequestUtil;

src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java

@@ -36,13 +36,13 @@ import jp.sf.fess.util.ComponentUtil;
 
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.S2Robot;
+import org.codelibs.robot.S2RobotContext;
+import org.codelibs.robot.service.DataService;
+import org.codelibs.robot.service.UrlFilterService;
+import org.codelibs.robot.service.UrlQueueService;
 import org.codelibs.solr.lib.SolrGroup;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.S2Robot;
-import org.seasar.robot.S2RobotContext;
-import org.seasar.robot.service.DataService;
-import org.seasar.robot.service.UrlFilterService;
-import org.seasar.robot.service.UrlQueueService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/helper/impl/CookieUserInfoHelperImpl.java

@@ -31,7 +31,7 @@ import jp.sf.fess.helper.SearchLogHelper;
 import jp.sf.fess.helper.UserInfoHelper;
 
 import org.codelibs.core.util.StringUtil;
-import org.seasar.robot.util.LruHashMap;
+import org.codelibs.robot.util.LruHashMap;
 import org.seasar.struts.util.RequestUtil;
 import org.seasar.struts.util.ResponseUtil;
 

src/main/java/jp/sf/fess/helper/impl/DatabaseHelperImpl.java

@@ -18,9 +18,9 @@ package jp.sf.fess.helper.impl;
 
 import jp.sf.fess.helper.DatabaseHelper;
 
-import org.seasar.robot.service.DataService;
-import org.seasar.robot.service.UrlFilterService;
-import org.seasar.robot.service.UrlQueueService;
+import org.codelibs.robot.service.DataService;
+import org.codelibs.robot.service.UrlFilterService;
+import org.codelibs.robot.service.UrlQueueService;
 
 public class DatabaseHelperImpl implements DatabaseHelper {
 

src/main/java/jp/sf/fess/interval/FessIntervalController.java

@@ -19,7 +19,7 @@ package jp.sf.fess.interval;
 import jp.sf.fess.helper.IntervalControlHelper;
 import jp.sf.fess.util.ComponentUtil;
 
-import org.seasar.robot.interval.impl.DefaultIntervalController;
+import org.codelibs.robot.interval.impl.DefaultIntervalController;
 
 public class FessIntervalController extends DefaultIntervalController {
 

src/main/java/jp/sf/fess/robot/FessS2RobotThread.java

@@ -43,17 +43,17 @@ import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.codelibs.core.util.DynamicProperties;
+import org.codelibs.robot.S2RobotThread;
+import org.codelibs.robot.builder.RequestDataBuilder;
+import org.codelibs.robot.client.S2RobotClient;
+import org.codelibs.robot.client.smb.SmbClient;
+import org.codelibs.robot.entity.RequestData;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.entity.UrlQueue;
+import org.codelibs.robot.log.LogType;
 import org.codelibs.solr.lib.SolrGroup;
 import org.codelibs.solr.lib.SolrGroupManager;
 import org.codelibs.solr.lib.policy.QueryType;
-import org.seasar.robot.S2RobotThread;
-import org.seasar.robot.builder.RequestDataBuilder;
-import org.seasar.robot.client.S2RobotClient;
-import org.seasar.robot.client.smb.SmbClient;
-import org.seasar.robot.entity.RequestData;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.entity.UrlQueue;
-import org.seasar.robot.log.LogType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,7 +203,7 @@ public class FessS2RobotThread extends S2RobotThread {
                     responseData.setParentUrl(urlQueue.getParentUrl());
                     responseData.setSessionId(robotContext.getSessionId());
                     responseData
-                            .setStatus(org.seasar.robot.Constants.NOT_MODIFIED_STATUS);
+                            .setStatus(org.codelibs.robot.Constants.NOT_MODIFIED_STATUS);
                     processResponse(urlQueue, responseData);
 
                     storeChildUrlsToQueue(urlQueue,

src/main/java/jp/sf/fess/screenshot/ScreenShotManager.java

@@ -34,9 +34,9 @@ import jp.sf.fess.helper.SystemHelper;
 import jp.sf.fess.util.ComponentUtil;
 
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.util.LruHashMap;
 import org.seasar.framework.container.annotation.tiger.DestroyMethod;
 import org.seasar.framework.container.annotation.tiger.InitMethod;
-import org.seasar.robot.util.LruHashMap;
 import org.seasar.struts.util.RequestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/jp/sf/fess/solr/IndexUpdater.java

@@ -37,23 +37,23 @@ import jp.sf.fess.util.ComponentUtil;
 
 import org.apache.solr.common.SolrInputDocument;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.S2Robot;
+import org.codelibs.robot.db.cbean.AccessResultCB;
+import org.codelibs.robot.db.exbhv.AccessResultBhv;
+import org.codelibs.robot.db.exbhv.AccessResultDataBhv;
+import org.codelibs.robot.db.exentity.AccessResult;
+import org.codelibs.robot.dbflute.cbean.PagingResultBean;
+import org.codelibs.robot.entity.AccessResultData;
+import org.codelibs.robot.service.DataService;
+import org.codelibs.robot.service.UrlFilterService;
+import org.codelibs.robot.service.UrlQueueService;
+import org.codelibs.robot.transformer.Transformer;
 import org.codelibs.solr.lib.SolrGroup;
 import org.codelibs.solr.lib.exception.SolrLibException;
 import org.seasar.dbflute.cbean.ListResultBean;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.container.annotation.tiger.Binding;
 import org.seasar.framework.container.annotation.tiger.BindingType;
-import org.seasar.robot.S2Robot;
-import org.seasar.robot.db.cbean.AccessResultCB;
-import org.seasar.robot.db.exbhv.AccessResultBhv;
-import org.seasar.robot.db.exbhv.AccessResultDataBhv;
-import org.seasar.robot.db.exentity.AccessResult;
-import org.seasar.robot.dbflute.cbean.PagingResultBean;
-import org.seasar.robot.entity.AccessResultData;
-import org.seasar.robot.service.DataService;
-import org.seasar.robot.service.UrlFilterService;
-import org.seasar.robot.service.UrlQueueService;
-import org.seasar.robot.transformer.Transformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,7 +173,7 @@ public class IndexUpdater extends Thread {
             cb.setupSelect_AccessResultDataAsOne();
             cb.query().setSessionId_InScope(sessionIdList);
             cb.query().addOrderBy_CreateTime_Asc();
-            cb.query().setStatus_Equal(org.seasar.robot.Constants.OK_STATUS);
+            cb.query().setStatus_Equal(org.codelibs.robot.Constants.OK_STATUS);
             if (maxDocumentCacheSize <= 0) {
                 maxDocumentCacheSize = 1;
             }
@@ -181,8 +181,8 @@ public class IndexUpdater extends Thread {
             cb.fetchPage(1);
 
             final List<SolrInputDocument> docList = new ArrayList<SolrInputDocument>();
-            final List<org.seasar.robot.entity.AccessResult> accessResultList = new ArrayList<org.seasar.robot.entity.AccessResult>();
-            final List<org.seasar.robot.db.exentity.AccessResultData> accessResultDataList = new ArrayList<org.seasar.robot.db.exentity.AccessResultData>();
+            final List<org.codelibs.robot.entity.AccessResult> accessResultList = new ArrayList<org.codelibs.robot.entity.AccessResult>();
+            final List<org.codelibs.robot.db.exentity.AccessResultData> accessResultDataList = new ArrayList<org.codelibs.robot.db.exentity.AccessResultData>();
 
             long updateTime = System.currentTimeMillis();
             int solrErrorCount = 0;
@@ -325,8 +325,8 @@ public class IndexUpdater extends Thread {
 
     private void processAccessResults(
             final List<SolrInputDocument> docList,
-            final List<org.seasar.robot.entity.AccessResult> accessResultList,
-            final List<org.seasar.robot.db.exentity.AccessResultData> accessResultDataList,
+            final List<org.codelibs.robot.entity.AccessResult> accessResultList,
+            final List<org.codelibs.robot.db.exentity.AccessResultData> accessResultDataList,
             final PagingResultBean<AccessResult> arList) {
         for (final AccessResult accessResult : arList) {
             if (logger.isDebugEnabled()) {
@@ -349,7 +349,7 @@ public class IndexUpdater extends Thread {
             if (accessResultData != null) {
                 accessResult.setAccessResultData(null);
                 accessResultDataList
-                        .add((org.seasar.robot.db.exentity.AccessResultData) accessResultData);
+                        .add((org.codelibs.robot.db.exentity.AccessResultData) accessResultData);
                 try {
                     final Transformer transformer = SingletonS2Container
                             .getComponent(accessResultData.getTransformerName());
@@ -515,8 +515,8 @@ public class IndexUpdater extends Thread {
     }
 
     private void cleanupAccessResults(
-            final List<org.seasar.robot.entity.AccessResult> accessResultList,
-            final List<org.seasar.robot.db.exentity.AccessResultData> accessResultDataList) {
+            final List<org.codelibs.robot.entity.AccessResult> accessResultList,
+            final List<org.codelibs.robot.db.exentity.AccessResultData> accessResultDataList) {
         if (!accessResultList.isEmpty()) {
             final long execTime = System.currentTimeMillis();
             final int size = accessResultList.size();

src/main/java/jp/sf/fess/transformer/AbstractFessFileTransformer.java

@@ -49,21 +49,21 @@ import org.apache.tika.metadata.HttpHeaders;
 import org.apache.tika.metadata.TikaMetadataKeys;
 import org.codelibs.core.util.DynamicProperties;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.RobotCrawlAccessException;
+import org.codelibs.robot.RobotSystemException;
+import org.codelibs.robot.client.smb.SmbClient;
+import org.codelibs.robot.db.cbean.AccessResultDataCB;
+import org.codelibs.robot.db.exbhv.AccessResultDataBhv;
+import org.codelibs.robot.entity.AccessResultData;
+import org.codelibs.robot.entity.ExtractData;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.entity.ResultData;
+import org.codelibs.robot.entity.UrlQueue;
+import org.codelibs.robot.extractor.Extractor;
+import org.codelibs.robot.util.CrawlingParameterUtil;
+import org.codelibs.robot.util.LruHashMap;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.util.SerializeUtil;
-import org.seasar.robot.RobotCrawlAccessException;
-import org.seasar.robot.RobotSystemException;
-import org.seasar.robot.client.smb.SmbClient;
-import org.seasar.robot.db.cbean.AccessResultDataCB;
-import org.seasar.robot.db.exbhv.AccessResultDataBhv;
-import org.seasar.robot.entity.AccessResultData;
-import org.seasar.robot.entity.ExtractData;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.entity.ResultData;
-import org.seasar.robot.entity.UrlQueue;
-import org.seasar.robot.extractor.Extractor;
-import org.seasar.robot.util.CrawlingParameterUtil;
-import org.seasar.robot.util.LruHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/transformer/AbstractFessXpathTransformer.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.transformer.impl.XpathTransformer;
 import org.seasar.framework.util.OgnlUtil;
-import org.seasar.robot.transformer.impl.XpathTransformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/transformer/FessFileTransformer.java

@@ -19,9 +19,9 @@ package jp.sf.fess.transformer;
 import jp.sf.fess.FessSystemException;
 import jp.sf.fess.util.ComponentUtil;
 
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.extractor.Extractor;
-import org.seasar.robot.extractor.ExtractorFactory;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.extractor.Extractor;
+import org.codelibs.robot.extractor.ExtractorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/jp/sf/fess/transformer/FessTikaTransformer.java

@@ -18,9 +18,9 @@ package jp.sf.fess.transformer;
 
 import jp.sf.fess.FessSystemException;
 
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.extractor.Extractor;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.extractor.Extractor;
 
 public class FessTikaTransformer extends AbstractFessFileTransformer {
     @Override

src/main/java/jp/sf/fess/transformer/FessXpathTransformer.java

@@ -49,20 +49,20 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.xpath.objects.XObject;
 import org.codelibs.core.util.StringUtil;
+import org.codelibs.robot.RobotCrawlAccessException;
+import org.codelibs.robot.RobotSystemException;
+import org.codelibs.robot.builder.RequestDataBuilder;
+import org.codelibs.robot.client.fs.ChildUrlsException;
+import org.codelibs.robot.entity.AccessResultData;
+import org.codelibs.robot.entity.RequestData;
+import org.codelibs.robot.entity.ResponseData;
+import org.codelibs.robot.entity.ResultData;
+import org.codelibs.robot.entity.UrlQueue;
+import org.codelibs.robot.util.CrawlingParameterUtil;
+import org.codelibs.robot.util.ResponseDataUtil;
 import org.cyberneko.html.parsers.DOMParser;
 import org.seasar.framework.util.InputStreamUtil;
 import org.seasar.framework.util.SerializeUtil;
-import org.seasar.robot.RobotCrawlAccessException;
-import org.seasar.robot.RobotSystemException;
-import org.seasar.robot.builder.RequestDataBuilder;
-import org.seasar.robot.client.fs.ChildUrlsException;
-import org.seasar.robot.entity.AccessResultData;
-import org.seasar.robot.entity.RequestData;
-import org.seasar.robot.entity.ResponseData;
-import org.seasar.robot.entity.ResultData;
-import org.seasar.robot.entity.UrlQueue;
-import org.seasar.robot.util.CrawlingParameterUtil;
-import org.seasar.robot.util.ResponseDataUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

src/main/java/jp/sf/fess/util/ComponentUtil.java

@@ -43,9 +43,9 @@ import jp.sf.fess.solr.IndexUpdater;
 
 import org.codelibs.core.crypto.CachedCipher;
 import org.codelibs.core.util.DynamicProperties;
+import org.codelibs.robot.extractor.ExtractorFactory;
 import org.codelibs.solr.lib.SolrGroupManager;
 import org.seasar.framework.container.SingletonS2Container;
-import org.seasar.robot.extractor.ExtractorFactory;
 
 public final class ComponentUtil {
     private static final String USER_AGENT_NAME = "userAgentName";

src/main/resources/fess_suggest.dicon

@@ -87,7 +87,7 @@
 		<property name="defaultMaxPerRoute">2</property>
 		<destroyMethod name="shutdown"></destroyMethod>
 	</component>
-	<component name="connectionMonitorTarget" class="org.seasar.robot.client.http.HcConnectionMonitorTarget">
+	<component name="connectionMonitorTarget" class="org.codelibs.robot.client.http.HcConnectionMonitorTarget">
 		<arg>clientConnectionManager</arg>
 		<arg>300000</arg>
 	</component>

src/main/resources/log4j.xml

@@ -30,10 +30,10 @@
   <logger name="jp.sf.fess" >
     <level value ="debug" />
   </logger>
-  <logger name="org.seasar.robot" >
+  <logger name="org.codelibs.robot" >
     <level value ="debug" />
   </logger>
-  <logger name="org.seasar.robot.dbflute" >
+  <logger name="org.codelibs.robot.dbflute" >
     <level value ="debug" />
   </logger>
   <logger name="org.codelibs" >

src/main/resources/s2robot_contentlength.dicon

@@ -2,7 +2,7 @@
 <!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
 	"http://www.seasar.org/dtd/components24.dtd">
 <components>
-	<component name="contentLengthHelper" class="org.seasar.robot.helper.ContentLengthHelper" instance="singleton" >
+	<component name="contentLengthHelper" class="org.codelibs.robot.helper.ContentLengthHelper" instance="singleton" >
 		<property name="defaultMaxLength">10485760L</property><!-- 10M -->
 		<initMethod name="addMaxLength">
 			<arg>"text/html"</arg>

src/main/resources/s2robot_db.dicon

@@ -15,7 +15,7 @@
     <include path="s2robot_sitemaps.dicon"/>
 
 	<!-- S2Robot -->
-	<component name="s2Robot" class="org.seasar.robot.S2Robot" instance="prototype" >
+	<component name="s2Robot" class="org.codelibs.robot.S2Robot" instance="prototype" >
 	</component>
 
 	<!-- Robot Thread -->
@@ -24,23 +24,23 @@
 	</component>
 
 	<!-- Entity -->
-	<component name="accessResult" class="org.seasar.robot.db.exentity.AccessResult" instance="prototype" >
+	<component name="accessResult" class="org.codelibs.robot.db.exentity.AccessResult" instance="prototype" >
 	</component>
-	<component name="urlQueue" class="org.seasar.robot.db.exentity.UrlQueue" instance="prototype" >
+	<component name="urlQueue" class="org.codelibs.robot.db.exentity.UrlQueue" instance="prototype" >
 	</component>
 
     <!-- Service -->
-	<component name="urlQueueService" class="org.seasar.robot.service.impl.DBUrlQueueServiceImpl" instance="prototype" >
+	<component name="urlQueueService" class="org.codelibs.robot.service.impl.DBUrlQueueServiceImpl" instance="prototype" >
 		<aspect pointcut="poll,visited,add,delete,deleteAll,generateUrlQueues,insert,offerAll,saveSession,updateSessionId">
 			s2robot_j2ee.requiredTx
 		</aspect>
 	</component>
-	<component name="dataService" class="org.seasar.robot.service.impl.DBDataServiceImpl" instance="prototype" >
+	<component name="dataService" class="org.codelibs.robot.service.impl.DBDataServiceImpl" instance="prototype" >
 		<aspect pointcut="getAccessResult,getAccessResultList,getCount,delete,deleteAll,iterate,iterateUrlDiff,store,update">
 			s2robot_j2ee.requiredTx
 		</aspect>
 	</component>
-	<component name="urlFilterService" class="org.seasar.robot.service.impl.DBUrlFilterServiceImpl" instance="prototype" >
+	<component name="urlFilterService" class="org.codelibs.robot.service.impl.DBUrlFilterServiceImpl" instance="prototype" >
 		<aspect pointcut="getExcludeUrlPatternList,getIncludeUrlPatternList,addExcludeUrlFilter,addIncludeUrlFilter,delete,deleteAll">
 			s2robot_j2ee.requiredTx
 		</aspect>

src/main/resources/s2robot_rule.dicon

@@ -4,7 +4,7 @@
 <components>
     <include path="s2robot_transformer.dicon"/>
     
-	<component name="ruleManager" class="org.seasar.robot.rule.impl.RuleManagerImpl" instance="prototype">
+	<component name="ruleManager" class="org.codelibs.robot.rule.impl.RuleManagerImpl" instance="prototype">
 		<initMethod name="addRule">
 			<arg>sitemapsRule</arg>
 		</initMethod>
@@ -22,10 +22,10 @@
 		</initMethod>
 	</component>
 
-	<component name="sitemapsRule" class="org.seasar.robot.rule.impl.RegexRule" >
+	<component name="sitemapsRule" class="org.codelibs.robot.rule.impl.RegexRule" >
 		<property name="ruleId">"sitemapsRule"</property>
 		<property name="responseProcessor">
-			<component class="org.seasar.robot.processor.impl.SitemapsResponseProcessor">
+			<component class="org.codelibs.robot.processor.impl.SitemapsResponseProcessor">
 			</component>
 		</property>
 		<initMethod name="addRule">
@@ -34,10 +34,10 @@
 		</initMethod>
 	</component>
 	
-	<component name="webHtmlRule" class="org.seasar.robot.rule.impl.RegexRule" >
+	<component name="webHtmlRule" class="org.codelibs.robot.rule.impl.RegexRule" >
 		<property name="ruleId">"webHtmlRule"</property>
 		<property name="responseProcessor">
-			<component class="org.seasar.robot.processor.impl.DefaultResponseProcessor">
+			<component class="org.codelibs.robot.processor.impl.DefaultResponseProcessor">
 				<property name="transformer">fessXpathTransformer</property>
 				<property name="successfulHttpCodes">new int[] {200}</property>
 				<property name="notModifiedHttpCodes">new int[] {304}</property>
@@ -55,10 +55,10 @@
 		</initMethod>
 	</component>
 
-	<component name="webFileRule" class="org.seasar.robot.rule.impl.RegexRule" >
+	<component name="webFileRule" class="org.codelibs.robot.rule.impl.RegexRule" >
 		<property name="ruleId">"webFileRule"</property>
 		<property name="responseProcessor">
-			<component class="org.seasar.robot.processor.impl.DefaultResponseProcessor">
+			<component class="org.codelibs.robot.processor.impl.DefaultResponseProcessor">
 				<property name="transformer">fessFileTransformer</property>
 				<property name="successfulHttpCodes">new int[] {200}</property>
 				<property name="notModifiedHttpCodes">new int[] {304}</property>
@@ -84,10 +84,10 @@
 		</initMethod>
 	</component>
 
-	<component name="fsFileRule" class="org.seasar.robot.rule.impl.RegexRule" >
+	<component name="fsFileRule" class="org.codelibs.robot.rule.impl.RegexRule" >
 		<property name="ruleId">"fsFileRule"</property>
 		<property name="responseProcessor">
-			<component class="org.seasar.robot.processor.impl.DefaultResponseProcessor">
+			<component class="org.codelibs.robot.processor.impl.DefaultResponseProcessor">
 				<property name="transformer">fessFileTransformer</property>
 				<property name="successfulHttpCodes">new int[] {200}</property>
 				<property name="notModifiedHttpCodes">new int[] {304}</property>
@@ -115,10 +115,10 @@
 	</component>
 
 
-	<component name="defaultRule" class="org.seasar.robot.rule.impl.RegexRule" >
+	<component name="defaultRule" class="org.codelibs.robot.rule.impl.RegexRule" >
 		<property name="ruleId">"defaultRule"</property>
 		<property name="responseProcessor">
-			<component class="org.seasar.robot.processor.impl.DefaultResponseProcessor">
+			<component class="org.codelibs.robot.processor.impl.DefaultResponseProcessor">
 				<property name="transformer">fessTikaTransformer</property>
 				<property name="successfulHttpCodes">new int[] {200}</property>
 				<property name="notModifiedHttpCodes">new int[] {304}</property>

src/main/resources/solrlib.dicon

@@ -56,7 +56,7 @@
 		<property name="defaultMaxPerRoute">2</property>
 		<destroyMethod name="shutdown"></destroyMethod>
 	</component>
-	<component name="connectionMonitorTarget" class="org.seasar.robot.client.http.HcConnectionMonitorTarget">
+	<component name="connectionMonitorTarget" class="org.codelibs.robot.client.http.HcConnectionMonitorTarget">
 		<arg>clientConnectionManager</arg>
 		<arg>300000</arg>
 	</component>

src/test/java/jp/sf/fess/dict/synonym/SynonymItemTest.java

@@ -16,8 +16,6 @@
 
 package jp.sf.fess.dict.synonym;
 
-import jp.sf.fess.dict.synonym.SynonymItem;
-
 import org.seasar.extension.unit.S2TestCase;
 
 public class SynonymItemTest extends S2TestCase {

src/test/java/jp/sf/fess/transformer/FessXpathTransformerTest.java

@@ -30,13 +30,13 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.codelibs.robot.builder.RequestDataBuilder;
+import org.codelibs.robot.client.fs.ChildUrlsException;
+import org.codelibs.robot.entity.RequestData;
+import org.codelibs.robot.entity.ResponseData;
 import org.cyberneko.html.parsers.DOMParser;
 import org.seasar.extension.unit.S2TestCase;
 import org.seasar.framework.container.ComponentNotFoundRuntimeException;
-import org.seasar.robot.builder.RequestDataBuilder;
-import org.seasar.robot.client.fs.ChildUrlsException;
-import org.seasar.robot.entity.RequestData;
-import org.seasar.robot.entity.ResponseData;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;