Changeset 29729


Ignore:
Timestamp:
02/11/15 18:47:05 (6 years ago)
Author:
ak19
Message:

First part of commit fixing up GLI to work with commit of reviosion 29687. In revision 29687 web.xml got split into web.xml and servlets.xml, which the first included as an entity. GLI parses web.xml and other XML files on startup, and now requires an EntityResolver to parse the inclusion of servlets.xml in web.xml. The use of an EntityResolver when parsing web.xml was also required in the GS3 server application code (in GS3/src/java), and worked there. The same change however didn't work in GLI, because the xerces and xml-apis (sax) classes used by GLI were not the same as what the GS3 server code used. The contents of xercesImpl.jar and xml-apis.jar used by GS3 have now replaced what was there in the older apache.jar, the rest of the contents are the same as before because they don't seem to be tightly coupled with the xerces and xml-apis parts of the apache.jar contents, whereas these two are.

Location:
main/trunk/gli
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/makejar.bat

    r25947 r29729  
    117117
    118118  cd jar
    119   "!JARPATH!\jar" xf ..\lib\apache.jar com org
     119  "!JARPATH!\jar" xf ..\lib\apache.jar com org javax
    120120  "!JARPATH!\jar" xf ..\lib\qfslib.jar de
    121121  "!JARPATH!\jar" xf ..\lib\rsyntaxtextarea.jar org
     
    159159:jarcmd
    160160:: Jar everything up
    161 ::"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help -C classes dictionary.properties -C classes dictionary_es.properties -C classes dictionary_fr.properties -C classes dictionary_ru.properties -C classes feedback.properties -C classes images -C classes xml -C jar com -C jar de -C jar org
     161::"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help -C classes dictionary.properties -C classes dictionary_es.properties -C classes dictionary_fr.properties -C classes dictionary_ru.properties -C classes feedback.properties -C classes images -C classes xml -C jar com -C jar de -C jar org -C jar javax
    162162
    163163:: include all the properties (and other loose) files in the toplevel classes directory into the GLI.jar
    164164:: (Do something similar to get any and all folders inside the toplevel jar folder included into GLI.jar?)
    165 "%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help %propfiles% -C classes images -C classes xml -C jar com -C jar de -C jar org
     165"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help %propfiles% -C classes images -C classes xml -C jar com -C jar de -C jar org -C jar javax
    166166
    167167
  • main/trunk/gli/makejar.sh

    r25683 r29729  
    4646# GLI class files and supporting libraries
    4747cd jar
    48 jar xf ../lib/apache.jar com org
     48jar xf ../lib/apache.jar com org javax
    4949jar xf ../lib/qfslib.jar de
    5050jar xf ../lib/rsyntaxtextarea.jar org theme.dtd
Note: See TracChangeset for help on using the changeset viewer.