Skip to content

Commit 017970d

Browse files
author
Jeremy Whiting
committed
Added support to locally resolve dtd or entity files.
1 parent cb87067 commit 017970d

36 files changed

+14325
-7
lines changed

‎build.xml

+8
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@
187187
<!-- Ensure JUnit is available, since we hide the ant runtime -->
188188
<dependency groupId="junit" artifactId="junit" version="4.11"
189189
scope="test" optional="true"/>
190+
<dependency groupId="xml-resolver" artifactId="xml-resolver" version="1.2"
191+
scope="compile" optional="true"/>
190192

191193
<dependency groupId="org.osgi" artifactId="org.osgi.core" version="4.3.1"
192194
scope="provided" optional="true"/>
@@ -677,6 +679,11 @@ Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=opt
677679
<pathelement location="${artifact.jar}"/>
678680
</classpath>
679681
</javac>
682+
<copy todir="${builddir}/tests">
683+
<fileset dir="${srcdir}">
684+
<include name="catalog/**/*"/>
685+
</fileset>
686+
</copy>
680687
<jar jarfile="${jardir}/postgresql-tests.jar" basedir="${builddir}/tests"/>
681688
</target>
682689

@@ -712,6 +719,7 @@ Import-Package: javax.sql, javax.transaction.xa, javax.naming, *;resolution:=opt
712719
<pathelement location="${artifact.jar}" />
713720
<pathelement location="${jardir}/postgresql-tests.jar" />
714721
<pathelement path="${java.class.path}" />
722+
<pathelement path="catalog" />
715723
</classpath>
716724
<test name="org.postgresql.test.jdbc2.Jdbc2TestSuite" outfile="${testResultsDir}/jdbc2"/>
717725
<test name="org.postgresql.test.jdbc2.optional.OptionalTestSuite" outfile="${testResultsDir}/jdbc2optional"/>

‎catalog/4.2/ChangeLog

+232
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
2002-07-17 Norman Walsh <nwalsh@users.sourceforge.net>
2+
3+
* calstblx.dtd, catalog.xml, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd:
4+
DocBook XML V4.2 released
5+
6+
2002-05-28 Norman Walsh <nwalsh@users.sourceforge.net>
7+
8+
* calstblx.dtd, catalog.xml, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd:
9+
Updated comments to reflect CR3
10+
11+
2002-05-21 Norman Walsh <nwalsh@users.sourceforge.net>
12+
13+
* dbnotnx.mod: SVG notation accidentally left out of notation.class
14+
15+
* docbookx.dtd: Fix syntactic error intentionally introduced behind mutually exclusive PEs. Now make the DTD useless, but not syntactically invalid
16+
17+
2002-05-12 Norman Walsh <nwalsh@users.sourceforge.net>
18+
19+
* dbpoolx.mod: Add accidentally missing local.info.class to info.class
20+
21+
2002-03-19 Norman Walsh <nwalsh@users.sourceforge.net>
22+
23+
* calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod:
24+
Prepare for CR1
25+
26+
* catalog.xml, docbook.cat: Prepare for CR1 and fix search-and-replace typos
27+
28+
* dbpoolx.mod: Revise graphic attributes: add contentwidth, contentdepth, and valign
29+
30+
* dbpoolx.mod: Implemented RFE #480954: add textdata element
31+
32+
* dbpoolx.mod: Make type other tokens in bibliorelation unique for SGML compatibility
33+
34+
* dbpoolx.mod: Make spatial/temporal other tokens unique for SGML compatibility
35+
36+
* dbpoolx.mod: Added blockinfo element
37+
38+
* dbpoolx.mod: Move bibliorelation type attribute into a PE so that it can be expanded the way we want
39+
40+
* dbpoolx.mod: Implemented RFE #480957
41+
42+
* dbpoolx.mod: RFE #513426: Text alternative for tables
43+
44+
* dbpoolx.mod: Added bibliosource, bibliorelation, and bibliocoverage
45+
46+
* dbpoolx.mod: Add consortium to the list of classes on orgname
47+
48+
* dbpoolx.mod: Add class attribute to orgname
49+
50+
* docbookx.dtd: DocBook V4.2 Candidate Release 1 released
51+
52+
2002-02-05 Norman Walsh <nwalsh@users.sourceforge.net>
53+
54+
* dbhierx.mod: Implemented RFE #501363
55+
56+
* dbpoolx.mod: Implemented RFE #498848
57+
58+
* dbpoolx.mod: Implemented RFE #492099
59+
60+
* dbpoolx.mod: Implemented RFE #480955
61+
62+
2002-01-06 Norman Walsh <nwalsh@users.sourceforge.net>
63+
64+
* dbcentx.mod: Added marked sections around character set entity references
65+
66+
2001-11-20 Norman Walsh <nwalsh@users.sourceforge.net>
67+
68+
* calstblx.dtd, catalog.xml, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd:
69+
DocBook V4.2b1 released
70+
71+
* dbpoolx.mod: Implemented RFE #482821
72+
73+
2001-11-19 Norman Walsh <nwalsh@users.sourceforge.net>
74+
75+
* dbhierx.mod, dbpoolx.mod: Implemented RFE #456460
76+
77+
2001-11-18 Norman Walsh <nwalsh@users.sourceforge.net>
78+
79+
* dbpoolx.mod: RFE #482817: Add errortext element
80+
81+
2001-11-17 Norman Walsh <nwalsh@users.sourceforge.net>
82+
83+
* dbpoolx.mod: RFE 482821: Add extension to the list of class values on filename
84+
85+
* dbpoolx.mod: RFE 482053: Add support for DOI in meta
86+
87+
* dbpoolx.mod: Removed bogus occurrence indicator in info.class; fixed typo in qandaset PEs
88+
89+
2001-11-13 Norman Walsh <nwalsh@users.sourceforge.net>
90+
91+
* 40chg.txt, 41chg.txt, LostLog: Removed old files
92+
93+
* Makefile: Makefile
94+
95+
* Makefile: Fixed typo
96+
97+
* README: Removed version information
98+
99+
* README, readme.txt: Renamed
100+
101+
* calstblx.dtd, catalog.xml, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd:
102+
Removed 'XML' from public identifiers for files that will now be common to both XML and SGML
103+
104+
* catalog.xml: Fixed missing end tag
105+
106+
2001-11-12 Norman Walsh <nwalsh@users.sourceforge.net>
107+
108+
* calstblx.dtd, dbcentx.mod, dbgenent.mod, dbnotnx.mod, readme.txt:
109+
Updated version numbers
110+
111+
* catalog.xml, docbook.cat: Added XML Catalog; updated public identifiers in catalog
112+
113+
* dbpoolx.mod: Former RFE 133: Added newsgroup class to systemitem
114+
115+
* dbpoolx.mod: Implemented RFE #480956
116+
117+
2001-11-09 Norman Walsh <nwalsh@users.sourceforge.net>
118+
119+
* dbhierx.mod: Implemented RFE #426382
120+
121+
* dbhierx.mod: Implemented RFE #417671
122+
123+
* dbhierx.mod, dbpoolx.mod: Implemented RFE #436072
124+
125+
* dbhierx.mod, dbpoolx.mod, docbookx.dtd: Changed version number
126+
127+
* dbnotnx.mod: Implemented RFE #440597
128+
129+
* dbpoolx.mod: Implemented RFE #431413
130+
131+
* dbpoolx.mod: Implemented RFE #434439
132+
133+
* dbpoolx.mod: Expand the content model of the following elements from smallcptr.char.mix back to cptr.char.mix: interfacename, action, database, filename, hardware, keycap, option, parameter, property, and systemitem (command, interface, and literal were never reduced).
134+
135+
* dbpoolx.mod: Implemented RFE #431415
136+
137+
* dbpoolx.mod: Implemented RFE #431418
138+
139+
* dbpoolx.mod: Implemented RFE #431419
140+
141+
* dbpoolx.mod: Implemented RFE #439136
142+
143+
* dbpoolx.mod: Implemented RFE #435485
144+
145+
* dbpoolx.mod: Implemented RFE #435466
146+
147+
2001-11-07 Norman Walsh <nwalsh@users.sourceforge.net>
148+
149+
* calstblx.dtd, dbcentx.mod, dbhierx.mod, dbpoolx.mod, docbookx.dtd:
150+
Towards a 4.2 release: reparameterize so that the SGML DTD is just a customization of the XML DTD
151+
152+
* calstblx.dtd, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd:
153+
Whitespace fixes
154+
155+
2001-08-07 Norman Walsh <nwalsh@users.sourceforge.net>
156+
157+
* dbhierx.mod: RFE 426382: Norm to allow SimpleSect inside Section
158+
159+
* dbpoolx.mod: RFE 431419: Norm to add markup for FS type and partition
160+
161+
* dbpoolx.mod: Fix comments; implement proposal of the TC to expand the content model of selected inlines
162+
163+
* dbpoolx.mod: RFE 434439: Add language attribute to fieldsynopsis et al.
164+
165+
* dbpoolx.mod: RFE 431418: Norm to add typing to funcdef and paramdef
166+
167+
* dbpoolx.mod: RFE 431415: Norm to add markup for host identifiers
168+
169+
2001-06-18 Norman Walsh <nwalsh@users.sourceforge.net>
170+
171+
* 40chg.txt, 41chg.txt, LostLog, Makefile, calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.cat, docbookx.dtd, readme.txt:
172+
Additional work on DocBook XML V5.0; I had the wrong CVS repository for a while so there's a bunch of changes lumped together here
173+
174+
* Makefile: branches: 1.1.2;
175+
file Makefile was initially added on branch V50-devel.
176+
177+
2001-03-12 <ndw@users.sourceforge.net>
178+
179+
* calstblx.dtd, dbcentx.mod, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt:
180+
Updated version numbers
181+
182+
* dbcentx.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, soextblx.dtd:
183+
New file.
184+
185+
* docbook.cat: New file.
186+
187+
* docbookx.cat: branches: 1.1.2;
188+
file docbookx.cat was initially added on branch V50-devel.
189+
190+
* docbookx.cat: New file.
191+
192+
2001-01-14 <ndw@users.sourceforge.net>
193+
194+
* dbpoolx.mod: branches: 1.5.2;
195+
RFE #140: Allow multiple MsgExplan inside SimpleMsgEntry
196+
197+
2000-11-12 <ndw@users.sourceforge.net>
198+
199+
* dbhierx.mod: branches: 1.6.2;
200+
Add refentry; accidentally left out
201+
202+
* dbhierx.mod: Allow beginpage to be the first child of toc, lot, appendix, chapter,
203+
part, preface, reference, and refentry. (It can't be at the start of
204+
bibliography, glossary, index, or setindex because of ambiguity
205+
problems.)
206+
207+
2000-09-19 <ndw@users.sourceforge.net>
208+
209+
* 40chg.txt, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbookx.dtd, readme.txt, soextblx.dtd:
210+
DocBook XML V4.0
211+
212+
* 40chg.txt, soextblx.dtd: branches: 1.2.2;
213+
DocBook XML V4.1
214+
215+
* 41chg.txt, LostLog, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbgenent.mod, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd, readme.txt:
216+
DocBook XML V4.1.1
217+
218+
* 41chg.txt, LostLog, calstblx.dtd, dbcentx.mod, dbgenent.ent, dbhierx.mod, dbnotnx.mod, dbpoolx.mod, docbook.cat, docbookx.dtd, readme.txt:
219+
DocBook XML V4.1
220+
221+
* 41chg.txt, LostLog, docbook.cat: branches: 1.3.2;
222+
DocBook XML V4.1.2
223+
224+
* calstblx.dtd, dbcentx.mod, dbnotnx.mod, docbookx.dtd, readme.txt:
225+
branches: 1.4.2;
226+
DocBook XML V4.1.2
227+
228+
* dbgenent.mod: branches: 1.2.2;
229+
DocBook XML V4.1.2
230+
231+
* dbhierx.mod, dbpoolx.mod: DocBook XML V4.1.2
232+

‎catalog/4.2/README

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
README for the DocBook XML DTD
2+
3+
For more information about DocBook, please see
4+
5+
http://www.oasis-open.org/docbook/
6+
7+
Please send all questions, comments, concerns, and bug reports to the
8+
DocBook mailing list: docbook@lists.oasis-open.org

0 commit comments

Comments
 (0)