Changeset 29159

Timestamp:

2014-07-23T18:11:31+12:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge corrected the windows path to log4j.properties for solr

File:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (1 diff)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -413 +413 @@
     
     my $solr_log4j    = &util::filename_cat($solr_home, "conf", "log4j.properties");    
-    
-    #my $server_java_cmd = "java -Dlog4j.configuration=file://$solr_log4j -classpath \"$solr_home/lib/java/*:$solr_slf4j/*\" $server_props -jar \"$full_server_jar\"";  
-    my $prefix = (defined $ENV{'GSDLOS'} && (($ENV{'GSDLOS'} =~ m/windows/) && ($^O ne "cygwin"))) ? "file:/" : "file://";
-    my $server_java_cmd = "java -Dlog4j.configuration=$prefix$solr_log4j -classpath \"$solr_jar_dep\" $server_props -jar \"$full_server_jar\"";
-
-
+    if (defined $ENV{'GSDLOS'} && (($ENV{'GSDLOS'} =~ m/windows/) && ($^O ne "cygwin"))) {
+        $solr_log4j =~ s@\\@\/@g;
+        $solr_log4j = "/$solr_log4j"; # Three slashes on windows: file///c:/path/to/log4j.properties
+    }
+    
+    #my $server_java_cmd = "java -Dlog4j.configuration=file://$solr_log4j -classpath \"$solr_home/lib/java/*:$solr_slf4j/*\" $server_props -jar \"$full_server_jar\"";
+    my $server_java_cmd = "java -Dlog4j.configuration=file://$solr_log4j -classpath \"$solr_jar_dep\" $server_props -jar \"$full_server_jar\"";
     my $server_status = "unknown";