fix #59

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

@@ -18,6 +18,7 @@ package jp.sf.fess.helper;
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -32,20 +33,15 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.servlet.ServletContext;
-
 import jp.sf.fess.Constants;
 import jp.sf.fess.FessSystemException;
 import jp.sf.fess.db.exentity.RoleType;
-import jp.sf.fess.exec.Crawler;
 import jp.sf.fess.job.JobExecutor;
 import jp.sf.fess.service.RoleTypeService;
-import jp.sf.fess.util.InputStreamThread;
 import jp.sf.fess.util.ResourceUtil;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
 import org.codelibs.solr.lib.SolrGroup;
 import org.codelibs.solr.lib.policy.QueryType;
 import org.codelibs.solr.lib.policy.StatusPolicy;
@@ -179,138 +175,17 @@ public class SystemHelper implements Serializable {
         }
     }
 
-    public void executeCrawler(final String sessionId,
-            final String[] webConfigIds, final String[] fileConfigIds,
-            final String[] dataConfigIds, final String operation,
-            final int documentExpires) {
-        final List<String> crawlerCmdList = new ArrayList<String>();
-        final String cpSeparator = SystemUtils.IS_OS_WINDOWS ? ";" : ":";
-        final ServletContext servletContext = SingletonS2Container
-                .getComponent(ServletContext.class);
-
-        crawlerCmdList.add(javaCommandPath);
-
-        // -cp
-        crawlerCmdList.add("-cp");
-        final StringBuilder buf = new StringBuilder();
-        // WEB-INF/cmd/resources
-        buf.append("WEB-INF");
-        buf.append(File.separator);
-        buf.append("cmd");
-        buf.append(File.separator);
-        buf.append("resources");
-        buf.append(cpSeparator);
-        // WEB-INF/classes
-        buf.append("WEB-INF");
-        buf.append(File.separator);
-        buf.append("classes");
-        // WEB-INF/lib
-        appendJarFile(cpSeparator, servletContext, buf, "/WEB-INF/lib",
-                "WEB-INF" + File.separator + "lib" + File.separator);
-        // WEB-INF/cmd/lib
-        appendJarFile(cpSeparator, servletContext, buf, "/WEB-INF/cmd/lib",
-                "WEB-INF" + File.separator + "cmd" + File.separator + "lib"
-                        + File.separator);
-        crawlerCmdList.add(buf.toString());
-
-        crawlerCmdList.add("-Dfess.crawler.process=true");
-        crawlerCmdList.add("-Dsolr.solr.home=" + solrHome);
-        crawlerCmdList.add("-Dfess.log.file=" + logFilePath);
-        if (crawlerJavaOptions != null) {
-            for (final String value : crawlerJavaOptions) {
-                crawlerCmdList.add(value);
-            }
-        }
-
-        File ownTmpDir = null;
-        if (useOwnTmpDir) {
-            final String tmpDir = System.getProperty("java.io.tmpdir");
-            if (StringUtil.isNotBlank(tmpDir)) {
-                ownTmpDir = new File(tmpDir, "fessTmpDir_" + sessionId);
-                if (ownTmpDir.mkdirs()) {
-                    crawlerCmdList.add("-Djava.io.tmpdir="
-                            + ownTmpDir.getAbsolutePath());
-                } else {
-                    ownTmpDir = null;
-                }
-            }
-        }
-
-        crawlerCmdList.add(Crawler.class.getCanonicalName());
-
-        crawlerCmdList.add("--sessionId");
-        crawlerCmdList.add(sessionId);
-        crawlerCmdList.add("--name");
-        crawlerCmdList.add(Constants.CRAWLING_SESSION_SYSTEM_NAME);
-
-        if (webConfigIds != null && webConfigIds.length > 0) {
-            crawlerCmdList.add("-w");
-            crawlerCmdList.add(StringUtils.join(webConfigIds, ','));
-        }
-        if (fileConfigIds != null && fileConfigIds.length > 0) {
-            crawlerCmdList.add("-f");
-            crawlerCmdList.add(StringUtils.join(fileConfigIds, ','));
-        }
-        if (dataConfigIds != null && dataConfigIds.length > 0) {
-            crawlerCmdList.add("-d");
-            crawlerCmdList.add(StringUtils.join(dataConfigIds, ','));
-        }
-        if (StringUtil.isNotBlank(operation)) {
-            crawlerCmdList.add("-o");
-            crawlerCmdList.add(operation);
-        }
-        if (documentExpires >= -1) {
-            crawlerCmdList.add("-e");
-            crawlerCmdList.add(Integer.toString(documentExpires));
-        }
-
-        final File baseDir = new File(servletContext.getRealPath("/"));
-
-        if (logger.isInfoEnabled()) {
-            logger.info("Crawler: \nDirectory=" + baseDir + "\nOptions="
-                    + crawlerCmdList);
-        }
-
-        final ProcessBuilder pb = new ProcessBuilder(crawlerCmdList);
-        pb.directory(baseDir);
-        pb.redirectErrorStream(true);
-
+    public Process startCrawlerProcess(final String sessionId,
+            final ProcessBuilder processBuilder) {
         destroyCrawlerProcess(sessionId);
-
+        Process currentProcess;
         try {
-            final Process currentProcess = pb.start();
+            currentProcess = processBuilder.start();
             destroyCrawlerProcess(runningProcessMap.putIfAbsent(sessionId,
                     currentProcess));
-
-            final InputStreamThread it = new InputStreamThread(
-                    currentProcess.getInputStream(), Constants.UTF_8);
-            it.start();
-
-            currentProcess.waitFor();
-            it.join(5000);
-
-            final int exitValue = currentProcess.exitValue();
-
-            if (logger.isInfoEnabled()) {
-                logger.info("Crawler: Exit Code=" + exitValue
-                        + " - Crawler Process Output:\n" + it.getOutput());
-            }
-            if (exitValue != 0) {
-                throw new FessSystemException("Exit Code: " + exitValue
-                        + "\nOutput:\n" + it.getOutput());
-            }
-        } catch (final FessSystemException e) {
-            throw e;
-        } catch (final InterruptedException e) {
-            logger.warn("Crawler Process interrupted.");
-        } catch (final Exception e) {
+            return currentProcess;
+        } catch (final IOException e) {
             throw new FessSystemException("Crawler Process terminated.", e);
-        } finally {
-            destroyCrawlerProcess(sessionId);
-            if (ownTmpDir != null && !ownTmpDir.delete()) {
-                logger.warn("Could not delete a temp dir: "
-                        + ownTmpDir.getAbsolutePath());
-            }
         }
     }
 
@@ -340,25 +215,6 @@ public class SystemHelper implements Serializable {
         }
     }
 
-    private void appendJarFile(final String cpSeparator,
-            final ServletContext servletContext, final StringBuilder buf,
-            final String libDirPath, final String basePath) {
-        final File libDir = new File(servletContext.getRealPath(libDirPath));
-        final File[] jarFiles = libDir.listFiles(new FilenameFilter() {
-            @Override
-            public boolean accept(final File dir, final String name) {
-                return name.toLowerCase().endsWith(".jar");
-            }
-        });
-        if (jarFiles != null) {
-            for (final File file : jarFiles) {
-                buf.append(cpSeparator);
-                buf.append(basePath);
-                buf.append(file.getName());
-            }
-        }
-    }
-
     public String getUsername() {
         String username = RequestUtil.getRequest().getRemoteUser();
         if (StringUtil.isBlank(username)) {

src/main/java/jp/sf/fess/job/CrawlJob.java

@@ -16,34 +16,104 @@
 
 package jp.sf.fess.job;
 
+import java.io.File;
+import java.io.FilenameFilter;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
+import javax.servlet.ServletContext;
 
 import jp.sf.fess.Constants;
 import jp.sf.fess.FessSystemException;
+import jp.sf.fess.exec.Crawler;
 import jp.sf.fess.helper.SystemHelper;
 import jp.sf.fess.job.JobExecutor.ShutdownListener;
+import jp.sf.fess.util.InputStreamThread;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.seasar.framework.container.SingletonS2Container;
+import org.seasar.framework.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CrawlJob {
+    private static final Logger logger = LoggerFactory
+            .getLogger(CrawlJob.class);
+
+    protected JobExecutor jobExecutor;
+
+    protected String sessionId;
+
+    protected String[] webConfigIds;
+
+    protected String[] fileConfigIds;
+
+    protected String[] dataConfigIds;
+
+    protected String operation;
+
+    protected String logFilePath;
 
     protected int documentExpires = -2;
 
+    public CrawlJob jobExecutor(final JobExecutor jobExecutor) {
+        this.jobExecutor = jobExecutor;
+        return this;
+    }
+
+    public CrawlJob sessionId(final String sessionId) {
+        this.sessionId = sessionId;
+        return this;
+    }
+
+    public CrawlJob operation(final String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    public CrawlJob logFilePath(final String logFilePath) {
+        this.logFilePath = logFilePath;
+        return this;
+    }
+
+    public CrawlJob documentExpires(final int documentExpires) {
+        this.documentExpires = documentExpires;
+        return this;
+    }
+
+    public CrawlJob webConfigIds(final String[] webConfigIds) {
+        this.webConfigIds = webConfigIds;
+        return this;
+    }
+
+    public CrawlJob fileConfigIds(final String[] fileConfigIds) {
+        this.fileConfigIds = fileConfigIds;
+        return this;
+    }
+
+    public CrawlJob dataConfigIds(final String[] dataConfigIds) {
+        this.dataConfigIds = dataConfigIds;
+        return this;
+    }
+
     public String execute(final JobExecutor jobExecutor) {
-        return execute(jobExecutor, null, null, null, Constants.COMMIT);
+        jobExecutor(jobExecutor);
+        operation(Constants.COMMIT);
+        return execute();
     }
 
     public String execute(final JobExecutor jobExecutor,
             final String[] webConfigIds, final String[] fileConfigIds,
             final String[] dataConfigIds, final String operation) {
-
-        // create session id
-        final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-        final String sessionId = sdf.format(new Date());
-
-        return execute(jobExecutor, sessionId, webConfigIds, fileConfigIds,
-                dataConfigIds, operation);
+        jobExecutor(jobExecutor);
+        operation(Constants.COMMIT);
+        webConfigIds(webConfigIds);
+        fileConfigIds(fileConfigIds);
+        dataConfigIds(dataConfigIds);
+        return execute();
 
     }
 
@@ -51,10 +121,25 @@ public class CrawlJob {
             final String sessionId, final String[] webConfigIds,
             final String[] fileConfigIds, final String[] dataConfigIds,
             final String operation) {
+        jobExecutor(jobExecutor);
+        operation(Constants.COMMIT);
+        webConfigIds(webConfigIds);
+        fileConfigIds(fileConfigIds);
+        dataConfigIds(dataConfigIds);
+        sessionId(sessionId);
+        return execute();
+    }
+
+    public String execute() {
         final StringBuilder resultBuf = new StringBuilder();
         final boolean runAll = webConfigIds == null && fileConfigIds == null
                 && dataConfigIds == null;
 
+        if (sessionId == null) { // create session id
+            final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+            final String sessionId = sdf.format(new Date());
+            sessionId(sessionId);
+        }
         resultBuf.append("Session Id: ").append(sessionId).append("\n");
         resultBuf.append("Web  Config Id:");
         if (webConfigIds == null) {
@@ -107,9 +192,7 @@ public class CrawlJob {
         }
 
         try {
-            SingletonS2Container.getComponent(SystemHelper.class)
-                    .executeCrawler(sessionId, webConfigIds, fileConfigIds,
-                            dataConfigIds, operation, documentExpires);
+            executeCrawler();
         } catch (final FessSystemException e) {
             throw e;
         } catch (final Exception e) {
@@ -120,12 +203,156 @@ public class CrawlJob {
 
     }
 
-    public int getDocumentExpires() {
-        return documentExpires;
-    }
+    protected void executeCrawler() {
+        final List<String> crawlerCmdList = new ArrayList<String>();
+        final String cpSeparator = SystemUtils.IS_OS_WINDOWS ? ";" : ":";
+        final ServletContext servletContext = SingletonS2Container
+                .getComponent(ServletContext.class);
+        final SystemHelper systemHelper = SingletonS2Container
+                .getComponent(SystemHelper.class);
 
-    public void setDocumentExpires(final int documentExpires) {
-        this.documentExpires = documentExpires;
+        crawlerCmdList.add(systemHelper.getJavaCommandPath());
+
+        // -cp
+        crawlerCmdList.add("-cp");
+        final StringBuilder buf = new StringBuilder();
+        // WEB-INF/cmd/resources
+        buf.append("WEB-INF");
+        buf.append(File.separator);
+        buf.append("cmd");
+        buf.append(File.separator);
+        buf.append("resources");
+        buf.append(cpSeparator);
+        // WEB-INF/classes
+        buf.append("WEB-INF");
+        buf.append(File.separator);
+        buf.append("classes");
+        // WEB-INF/lib
+        appendJarFile(cpSeparator, servletContext, buf, "/WEB-INF/lib",
+                "WEB-INF" + File.separator + "lib" + File.separator);
+        // WEB-INF/cmd/lib
+        appendJarFile(cpSeparator, servletContext, buf, "/WEB-INF/cmd/lib",
+                "WEB-INF" + File.separator + "cmd" + File.separator + "lib"
+                        + File.separator);
+        crawlerCmdList.add(buf.toString());
+
+        crawlerCmdList.add("-Dfess.crawler.process=true");
+        crawlerCmdList.add("-Dsolr.solr.home=" + systemHelper.getSolrHome());
+        if (logFilePath == null) {
+            logFilePath = systemHelper.getLogFilePath();
+        }
+        crawlerCmdList.add("-Dfess.log.file=" + logFilePath);
+        if (systemHelper.getCrawlerJavaOptions() != null) {
+            for (final String value : systemHelper.getCrawlerJavaOptions()) {
+                crawlerCmdList.add(value);
+            }
+        }
+
+        File ownTmpDir = null;
+        if (systemHelper.isUseOwnTmpDir()) {
+            final String tmpDir = System.getProperty("java.io.tmpdir");
+            if (StringUtil.isNotBlank(tmpDir)) {
+                ownTmpDir = new File(tmpDir, "fessTmpDir_" + sessionId);
+                if (ownTmpDir.mkdirs()) {
+                    crawlerCmdList.add("-Djava.io.tmpdir="
+                            + ownTmpDir.getAbsolutePath());
+                } else {
+                    ownTmpDir = null;
+                }
+            }
+        }
+
+        crawlerCmdList.add(Crawler.class.getCanonicalName());
+
+        crawlerCmdList.add("--sessionId");
+        crawlerCmdList.add(sessionId);
+        crawlerCmdList.add("--name");
+        crawlerCmdList.add(Constants.CRAWLING_SESSION_SYSTEM_NAME);
+
+        if (webConfigIds != null && webConfigIds.length > 0) {
+            crawlerCmdList.add("-w");
+            crawlerCmdList.add(StringUtils.join(webConfigIds, ','));
+        }
+        if (fileConfigIds != null && fileConfigIds.length > 0) {
+            crawlerCmdList.add("-f");
+            crawlerCmdList.add(StringUtils.join(fileConfigIds, ','));
+        }
+        if (dataConfigIds != null && dataConfigIds.length > 0) {
+            crawlerCmdList.add("-d");
+            crawlerCmdList.add(StringUtils.join(dataConfigIds, ','));
+        }
+        if (StringUtil.isNotBlank(operation)) {
+            crawlerCmdList.add("-o");
+            crawlerCmdList.add(operation);
+        }
+        if (documentExpires >= -1) {
+            crawlerCmdList.add("-e");
+            crawlerCmdList.add(Integer.toString(documentExpires));
+        }
+
+        final File baseDir = new File(servletContext.getRealPath("/"));
+
+        if (logger.isInfoEnabled()) {
+            logger.info("Crawler: \nDirectory=" + baseDir + "\nOptions="
+                    + crawlerCmdList);
+        }
+
+        final ProcessBuilder pb = new ProcessBuilder(crawlerCmdList);
+        pb.directory(baseDir);
+        pb.redirectErrorStream(true);
+
+        try {
+            final Process currentProcess = systemHelper.startCrawlerProcess(
+                    sessionId, pb);
+
+            final InputStreamThread it = new InputStreamThread(
+                    currentProcess.getInputStream(), Constants.UTF_8);
+            it.start();
+
+            currentProcess.waitFor();
+            it.join(5000);
+
+            final int exitValue = currentProcess.exitValue();
+
+            if (logger.isInfoEnabled()) {
+                logger.info("Crawler: Exit Code=" + exitValue
+                        + " - Crawler Process Output:\n" + it.getOutput());
+            }
+            if (exitValue != 0) {
+                throw new FessSystemException("Exit Code: " + exitValue
+                        + "\nOutput:\n" + it.getOutput());
+            }
+        } catch (final FessSystemException e) {
+            throw e;
+        } catch (final InterruptedException e) {
+            logger.warn("Crawler Process interrupted.");
+        } catch (final Exception e) {
+            throw new FessSystemException("Crawler Process terminated.", e);
+        } finally {
+            systemHelper.destroyCrawlerProcess(sessionId);
+            if (ownTmpDir != null && !ownTmpDir.delete()) {
+                logger.warn("Could not delete a temp dir: "
+                        + ownTmpDir.getAbsolutePath());
+            }
+        }
     }
 
+    protected void appendJarFile(final String cpSeparator,
+            final ServletContext servletContext, final StringBuilder buf,
+            final String libDirPath, final String basePath) {
+        final File libDir = new File(servletContext.getRealPath(libDirPath));
+        final File[] jarFiles = libDir.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(final File dir, final String name) {
+                return name.toLowerCase().endsWith(".jar");
+            }
+        });
+        if (jarFiles != null) {
+            for (final File file : jarFiles) {
+                buf.append(cpSeparator);
+                buf.append(basePath);
+                buf.append(file.getName());
+            }
+        }
+    }
 }