Menu
▾
▴
[Sheets-cvs] sheets .sheetsrc,1.7,1.8 Sheets.sheets,1.35,1.36 build.xml,1.16,1.17
|
From: <ox-...@us...> - 2003-04-16 18:01:03
|
Update of /cvsroot/sheets/sheets In directory sc8-pr-cvs1:/tmp/cvs-serv17219 Modified Files: .sheetsrc Sheets.sheets build.xml Log Message: the doc parser now checks the public id before parsing arbitrary documents (no more error messages on random xml files) Index: .sheetsrc =================================================================== RCS file: /cvsroot/sheets/sheets/.sheetsrc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** .sheetsrc 1 Apr 2003 02:21:07 -0000 1.7 --- .sheetsrc 16 Apr 2003 18:00:49 -0000 1.8 *************** *** 3,8 **** ########################################## ! set compile-command "ant.bat compile" ! set recompile-command "ant.bat clean" #set beep-file "d:/sheets/beep.au" --- 3,8 ---- ########################################## ! set compile-command "./ant compile" ! set recompile-command "./ant clean" #set beep-file "d:/sheets/beep.au" *************** *** 27,31 **** set context-help-delay 100 ! set graphics-anti-aliasing true set toc-width 20 set editor-width 50 --- 27,31 ---- set context-help-delay 100 ! set graphics-anti-aliasing false set toc-width 20 set editor-width 50 Index: Sheets.sheets =================================================================== RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Sheets.sheets 2 Apr 2003 19:00:34 -0000 1.35 --- Sheets.sheets 16 Apr 2003 18:00:50 -0000 1.36 *************** *** 11790,11793 **** --- 11790,11801 ---- section exports nkramer:2281 nkramer:905 + object nkramer:2281 + pkg=org.browsecode.sheets + type=java + section text nkramer:2281 + // Pop up the query dialog with "default defaults". + public class ShowQueryDialog extends GenericShowQueryDialog + section exports nkramer:2281 + nkramer:905 object nkramer:2294 pkg=org.browsecode.sheets *************** *** 30263,30266 **** --- 30271,30284 ---- nkramer:29232 nkramer:29050 + object nkramer:29048 + pkg=org.browsecode.sheets + type=java + section text nkramer:29048 + class CopyFragmentToTempSheet extends ChangeContainerCommand + implements SpecialMultiCommand + section exports nkramer:29048 + nkramer:29049 + nkramer:29232 + nkramer:29050 object nkramer:29049 pkg=org.browsecode.sheets *************** *** 31302,31309 **** nkramer:30606 nkramer:30607 ! nkramer:30608 nkramer:30609 nkramer:30610 ! nkramer:30611 nkramer:30612 rgs:13569 --- 31320,31327 ---- nkramer:30606 nkramer:30607 ! nkramer:2281 nkramer:30609 nkramer:30610 ! nkramer:29048 nkramer:30612 rgs:13569 *************** *** 31399,31415 **** return StringSplitter.stripExtension(srcFile) + ".html"; } - object nkramer:30608 - pkg=org.browsecode.xml - type=java - section text nkramer:30608 - protected String[] DocExpert.persistenceTypes () { - return new String[] { "doc-para", "doc-source", - "doc-document", "doc-section", "doc-list", "doc-definition", - "doc-edit-command", "doc-edit-variable", - - // backwards compatibility - "xml-para", "xml-section", "xml-list", "doc-preformatted" - }; - } object nkramer:30609 pkg=org.browsecode.xml --- 31417,31420 ---- *************** *** 31465,31475 **** }; } - object nkramer:30611 - pkg=org.browsecode.xml - type=java - section text nkramer:30611 - protected Sentinel[] DocExpert.sentinels () { - return new Sentinel[] { new DocSentinel() }; - } object nkramer:30612 pkg=org.browsecode.xml --- 31470,31473 ---- *************** *** 31492,31495 **** --- 31490,31494 ---- schin:175 schin:176 + schin:1233 schin:177 nkramer:30616 *************** *** 31530,31534 **** this.text = text; Document doc = textToXml(text, true); ! if (doc != null) fragments = retrieveSubFragments(doc.getDocumentElement(), null, links, true); } --- 31529,31533 ---- this.text = text; Document doc = textToXml(text, true); ! if (doc != null && doc.getDoctype() != null && DOCUMENT_V11.equals(doc.getDoctype().getPublicId())) fragments = retrieveSubFragments(doc.getDocumentElement(), null, links, true); } *************** *** 70045,70048 **** --- 70044,70056 ---- return "Java fragments " + base + " named " + fullString; } + object ram:683 + pkg=org.browsecode.sheets + type=java + section text ram:683 + class ReferencesRecord + section exports ram:683 + ram:684 + ram:685 + ram:686 object schin:0 pkg=org.browsecode.sheets *************** *** 71459,71463 **** builder.setEntityResolver(new org.xml.sax.EntityResolver() { public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) { ! if (publicId.equals("-//APACHE//DTD Documentation V1.1//EN")) { return new org.xml.sax.InputSource(this.getClass().getResourceAsStream("dtd/document-v11.dtd")); } --- 71467,71471 ---- builder.setEntityResolver(new org.xml.sax.EntityResolver() { public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) { ! if (publicId.equals(DOCUMENT_V11)) { return new org.xml.sax.InputSource(this.getClass().getResourceAsStream("dtd/document-v11.dtd")); } *************** *** 82061,82073 **** public class SimpleNodeList implements NodeList section exports schin:1185 ! schin:1186 schin:1187 schin:1188 schin:1189 - object schin:1186 - pkg=org.browsecode.xml - type=java - section text schin:1186 - Node SimpleNodeList.node; object schin:1187 pkg=org.browsecode.xml --- 82069,82076 ---- public class SimpleNodeList implements NodeList section exports schin:1185 ! ram:683 schin:1187 schin:1188 schin:1189 object schin:1187 pkg=org.browsecode.xml *************** *** 82551,82554 **** --- 82554,82562 ---- super(); } + object schin:1233 + pkg=org.browsecode.xml + type=java + section text schin:1233 + static final String DocParser.DOCUMENT_V11 = "-//APACHE//DTD Documentation V1.1//EN"; object sjc:1 pkg=org.browsecode.sheets.dicer *************** *** 100333,100336 **** --- 100341,100345 ---- schin:175 schin:176 + schin:1233 schin:177 nkramer:30616 Index: build.xml =================================================================== RCS file: /cvsroot/sheets/sheets/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** build.xml 17 Jan 2003 22:42:39 -0000 1.16 --- build.xml 16 Apr 2003 18:00:53 -0000 1.17 *************** *** 91,94 **** --- 91,97 ---- <echo>Launching test...</echo> <java classname="org.browsecode.sheets.Sheets" maxmemory="192m" dir="${test}" fork="true"> + <!-- Fix for Solaris pref spaming --> + <jvmarg value="-Djava.util.prefs.syncInterval=2000000"/> + <arg line="${arg.sheets}"/> <arg value="${test-database}"/> *************** *** 134,137 **** --- 137,143 ---- <echo>Launching sheets...</echo> <java jar="${lib}/bootstrap-sheets.jar" maxmemory="384m" fork="true"> + <!-- Fix for Solaris pref spaming --> + <jvmarg value="-Djava.util.prefs.syncInterval=2000000"/> + <arg line="${arg.sheets}"/> <arg line="${arg.extra}"/> |
