Changeset 29730 for main/trunk/gli/src

Show
Ignore:
Timestamp:
11.02.2015 21:09:47 (5 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.

Location:
main/trunk/gli/src/org/greenstone/gatherer/util
Files:
1 added
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

    r29001 r29730  
    619619            parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", true); 
    620620            parser.setFeature("http://apache.org/xml/features/dom/include-ignorable-whitespace", false); 
     621            parser.setEntityResolver(new GLIEntityResolver()); 
    621622            parser.parse(isc); 
    622623            document = parser.getDocument();