Changeset 29730 for main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

Timestamp:

2015-02-11T21:09:47+13:00 (9 years ago)

Author:

ak19

Message:

The second and final part of the commits to getting GLI running again and parsing web.xml, after the changes to commit r29687, where web.xml was split into two and included server.xml. In this commit: 1. GLI uses an EntityResolver to resolve entities in web.xml that are defined in the included servlets.xml file. In order to keep XMLTools.java tidy and hopefully make the GLI entity resolver more reusable, the new GLIEntityResolver.java class checks default search paths first when asked to resolve entities. web/WEB-INF, where web.xml and servlets.xml live, has been added to the default search paths, as also the gli user dir where the web.xml and server.xml will be in a client-gli situation. 2. Small tidy up to Greenstone runtime's GSEntityResolver. 3. Remote Greenstone gliserver.pl needs to also transfer the new server.xml file when zipping up web.xml. 4. Minor touchups to the new README on apache.jar.

File:

• main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl (modified) (3 diffs)

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -746 +746 @@
     my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar");
     my $zip_file_path = &util::filename_cat($collection_directory, $collection_tail_name . "-file-" . $timestamp . ".zip");
-    my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\"";
+    my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\" servlets.xml";
     $ENV{'LANG'} = $lang_env;
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
@@ -787 +787 @@
     }
 
-    my $web_inf_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "WEB-INF");
+    my $web_inf_directory = &util::filename_cat($ENV{'GSDL3HOME'}, "WEB-INF");
     $gsdl_cgi->checked_chdir($web_inf_directory);
 
@@ -799 +799 @@
     my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar");
     my $zip_file_path = &util::filename_cat($web_inf_directory, "webxml" . $timestamp . ".zip");
-    my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\"";
+    my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\" servlets.xml";
     $ENV{'LANG'} = $lang_env;
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args";