Changeset 29159

Show
Ignore:
Timestamp:
23.07.2014 18:11:31 (5 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/perllib/solrserver.pm

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