Shinsuke Sugaya 11 years ago
parent
commit
1199ebcd98
2 changed files with 0 additions and 18 deletions
  1. 0 17
      src/main/java/jp/sf/fess/helper/SystemHelper.java
  2. 0 1
      src/main/resources/fess.dicon

+ 0 - 17
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 solrHome = System.getProperty("solr.solr.home");
 
 
-    private String solrDataDirName = "fess.solr.data.dir";
-
     private String javaCommandPath = "java";
     private String javaCommandPath = "java";
 
 
     private String filterPathEncoding = Constants.UTF_8;
     private String filterPathEncoding = Constants.UTF_8;
@@ -215,15 +213,8 @@ public class SystemHelper implements Serializable {
                         + File.separator);
                         + File.separator);
         crawlerCmdList.add(buf.toString());
         crawlerCmdList.add(buf.toString());
 
 
-        final String solrDataDir = System.getProperty(solrDataDirName);
-
         crawlerCmdList.add("-Dfess.crawler.process=true");
         crawlerCmdList.add("-Dfess.crawler.process=true");
         crawlerCmdList.add("-Dsolr.solr.home=" + solrHome);
         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);
         crawlerCmdList.add("-Dfess.log.file=" + logFilePath);
         if (crawlerJavaOptions != null) {
         if (crawlerJavaOptions != null) {
             for (final String value : crawlerJavaOptions) {
             for (final String value : crawlerJavaOptions) {
@@ -472,14 +463,6 @@ public class SystemHelper implements Serializable {
         this.solrHome = solrHome;
         this.solrHome = solrHome;
     }
     }
 
 
-    public String getSolrDataDirName() {
-        return solrDataDirName;
-    }
-
-    public void setSolrDataDirName(final String solrDataDirName) {
-        this.solrDataDirName = solrDataDirName;
-    }
-
     public String getJavaCommandPath() {
     public String getJavaCommandPath() {
         return javaCommandPath;
         return javaCommandPath;
     }
     }

+ 0 - 1
src/main/resources/fess.dicon

@@ -30,7 +30,6 @@
 		<property name="useOwnTmpDir">true</property>
 		<property name="useOwnTmpDir">true</property>
 		<property name="baseHelpLink">"http://fess.codelibs.org/{lang}/8.0/admin/"</property>
 		<property name="baseHelpLink">"http://fess.codelibs.org/{lang}/8.0/admin/"</property>
 		-->
 		-->
-		<property name="solrDataDirName">"fess.solr.data.dir"</property>
 		<property name="logFilePath">@System@getProperty("fess.log.file").replaceAll(".out", "_crawler.out")</property>
 		<property name="logFilePath">@System@getProperty("fess.log.file").replaceAll(".out", "_crawler.out")</property>
         <property name="crawlerJavaOptions">new String[] {
         <property name="crawlerJavaOptions">new String[] {
 "-Djava.awt.headless=true",
 "-Djava.awt.headless=true",