diff --git a/src/main/java/jp/sf/fess/helper/SystemHelper.java b/src/main/java/jp/sf/fess/helper/SystemHelper.java index 7d830bf43..96333994c 100644 --- a/src/main/java/jp/sf/fess/helper/SystemHelper.java +++ b/src/main/java/jp/sf/fess/helper/SystemHelper.java @@ -85,8 +85,6 @@ public class SystemHelper implements Serializable { private String solrHome = System.getProperty("solr.solr.home"); - private String solrDataDirName = "fess.solr.data.dir"; - private String javaCommandPath = "java"; private String filterPathEncoding = Constants.UTF_8; @@ -215,15 +213,8 @@ public class SystemHelper implements Serializable { + File.separator); crawlerCmdList.add(buf.toString()); - final String solrDataDir = System.getProperty(solrDataDirName); - crawlerCmdList.add("-Dfess.crawler.process=true"); crawlerCmdList.add("-Dsolr.solr.home=" + solrHome); - if (solrDataDir != null) { - crawlerCmdList.add("-Dsolr.data.dir=" + solrDataDir); - } else { - logger.warn("-D" + solrDataDirName + " is not found."); - } crawlerCmdList.add("-Dfess.log.file=" + logFilePath); if (crawlerJavaOptions != null) { for (final String value : crawlerJavaOptions) { @@ -472,14 +463,6 @@ public class SystemHelper implements Serializable { this.solrHome = solrHome; } - public String getSolrDataDirName() { - return solrDataDirName; - } - - public void setSolrDataDirName(final String solrDataDirName) { - this.solrDataDirName = solrDataDirName; - } - public String getJavaCommandPath() { return javaCommandPath; } diff --git a/src/main/resources/fess.dicon b/src/main/resources/fess.dicon index 7f8a02d73..60ac400c1 100644 --- a/src/main/resources/fess.dicon +++ b/src/main/resources/fess.dicon @@ -30,7 +30,6 @@ true "http://fess.codelibs.org/{lang}/8.0/admin/" --> - "fess.solr.data.dir" @System@getProperty("fess.log.file").replaceAll(".out", "_crawler.out") new String[] { "-Djava.awt.headless=true",