Changeset 29157

Timestamp:

2014-07-18T18:58:03+12:00 (10 years ago)

Author:

ak19

Message:

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

File:

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

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

@@ -408 +408 @@
     
     # https://wiki.apache.org/solr/SolrLogging
-    my $solr_slf4j    = &util::filename_cat($solr_home, "lib", "ext");
-    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 $solr_slf4j    = &util::filename_cat($solr_home, "lib", "ext", "*");
+    my $solr_lib_java    = &util::filename_cat($solr_home, "lib", "java", "*");
+    my $solr_jar_dep = &util::pathname_cat($solr_lib_java, $solr_slf4j);
+    
+    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\"";