Changeset 29157

Show
Ignore:
Timestamp:
18.07.2014 18:58:03 (5 years ago)
Author:
ak19
Message:

Fixed the command to run solr's jetty server on Windows

Files:
1 modified

Legend:

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

    r29142 r29157  
    408408     
    409409    # https://wiki.apache.org/solr/SolrLogging 
    410     my $solr_slf4j    = &util::filename_cat($solr_home, "lib", "ext"); 
    411     my $solr_log4j    = &util::filename_cat($solr_home, "conf", "log4j.properties"); 
    412     my $server_java_cmd = "java -Dlog4j.configuration=file://$solr_log4j -classpath \"$solr_home/lib/java/*:$solr_slf4j/*\" $server_props -jar \"$full_server_jar\""; 
     410    my $solr_slf4j    = &util::filename_cat($solr_home, "lib", "ext", "*"); 
     411    my $solr_lib_java    = &util::filename_cat($solr_home, "lib", "java", "*"); 
     412    my $solr_jar_dep = &util::pathname_cat($solr_lib_java, $solr_slf4j); 
     413     
     414    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\""; 
    413419 
    414420