Changeset 29729

Timestamp:

2015-02-11T18:47:05+13:00 (9 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:

• lib/README.txt (added)
• lib/apache.jar (modified) ( previous)
• makejar.bat (modified) (2 diffs)
• makejar.sh (modified) (1 diff)

main/trunk/gli/makejar.bat

@@ -117 +117 @@
 
   cd jar
-  "!JARPATH!\jar" xf ..\lib\apache.jar com org
+  "!JARPATH!\jar" xf ..\lib\apache.jar com org javax
   "!JARPATH!\jar" xf ..\lib\qfslib.jar de
   "!JARPATH!\jar" xf ..\lib\rsyntaxtextarea.jar org
@@ -159 +159 @@
 :jarcmd
 :: Jar everything up
-::"%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
+::"%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
 
 :: include all the properties (and other loose) files in the toplevel classes directory into the GLI.jar
 :: (Do something similar to get any and all folders inside the toplevel jar folder included into GLI.jar?)
-"%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
+"%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
 
 

main/trunk/gli/makejar.sh

@@ -46 +46 @@
 # GLI class files and supporting libraries
 cd jar
-jar xf ../lib/apache.jar com org
+jar xf ../lib/apache.jar com org javax
 jar xf ../lib/qfslib.jar de
 jar xf ../lib/rsyntaxtextarea.jar org theme.dtd