cvs commit: xml-batik/xdocs book.xml cvs.xml installing.xml
deweese 2003/09/26 06:39:25 Modified:xdocsbook.xml cvs.xml installing.xml Log: 1) More documenation work for new release/archive/nightly structures. Revision ChangesPath 1.15 +1 -1 xml-batik/xdocs/book.xml Index: book.xml === RCS file: /home/cvs/xml-batik/xdocs/book.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 1.3 +29 -16xml-batik/xdocs/cvs.xml Index: cvs.xml === RCS file: /home/cvs/xml-batik/xdocs/cvs.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cvs.xml 26 Sep 2003 10:38:00 - 1.2 +++ cvs.xml 26 Sep 2003 13:39:25 - 1.3 @@ -27,31 +27,44 @@ s1 title=Introduction p This page provides information about how to access Batik's -source code. There are three main ways: +source code. There are four main ways: /p ul - liThe first and easiest is by downloading a link + liThe first, and prefered method for developers, is + through AnonCVS. Anyone can checkout source code from + our anonymous CVS server. To do so, simply use the + following commands (if you are using a GUI CVS client, + configure it appropriately):br/ + + codecvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic/codebr/ + codelogin/codebr/ + codepassword: anoncvs/codebr/ + br/ + codecvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic/codebr/ + codecheckout xml-batik/codebr/br/ + /li + + liThe second and probably easiest is by downloading a link href=http://www.apache.org/dyn/closer.cgi/xml/batik;source distribution/link. These are the packages that start - with 'batik-src'. + with 'batik-src'. These correspond to the major releases of + Batik.br/ /li - liThe second is through link + liThe third is by downloading a link + href=http://cvs.apache.org/builds/xml-batik;nightly + build/link. The '-cvs-' packages contain a complete + copy of CVS. The '-src-' packages contain only what is + needed to build and run Batik. The biggest difference + being that cVS includes the link href=test.htmltest + infrastructure/link.br/ + /li + + liThe fourth is through link href=http://cvs.apache.org/viewcvs.cgi/xml-batik; viewcvs/link. This provides the ability to traverse the CVS repository over the web, and check differences between versions. - /li - liThe third is through AnonCVS. Anyone can checkout - source code from our anonymous CVS server. To do so, - simply use the following commands (if you are using a - GUI CVS client, configure it appropriately):br/ - codecvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic/codebr/ - codelogin/codebr/ - codepassword: anoncvs/codebr/ -br/ - codecvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic/codebr/ - codecheckout xml-batik/codebr/ /li /ul /s1 1.14 +30 -4 xml-batik/xdocs/installing.xml Index: installing.xml === RCS file: /home/cvs/xml-batik/xdocs/installing.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- installing.xml26 Sep 2003 12:28:28 - 1.13 +++ installing.xml26 Sep 2003 13:39:25 - 1.14 @@ -99,7 +99,7 @@ various components you will find in the download area and their intended use:/p ul -listrongbatik-/strongemversion/emstrong.zip/strong (e.g., codebatik-1.5.zip./code) +listrongbatik-/strongemversion/emstrong.zip/strong (e.g., codebatik-1.5.zip/code)br/ The embinary distribution/em contains a compiled executable JAR files that let you get started with Batik easily. This is the recommended distribution @@ -109,7 +109,8 @@ set of sample SVG files./li listrongbatik-src-/strongemversion/emstrong.zip/strong - (e.g., codebatik-src-1.5.zip./code)The emsource + (e.g., codebatik-src-1.5.zip/code)br/ + The emsource distribution/em contains a complete snapshot of the Batik
cvs commit: xml-batik/xdocs book.xml
deweese 2003/03/13 11:03:19
Modified:.build.xml
lib/build stylebook-1.0-b3_xalan-2.jar
resources/org/apache/batik/dom/svg/resources
dtdids.properties
sources/org/apache/batik/dom/svg SAXSVGDocumentFactory.java
xdocsbook.xml
Log:
1) DocBook/StyleBook works again.
2) Batik now skips reading the SVG DTD unless validation is turned on.
Revision ChangesPath
1.125 +5 -1 xml-batik/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- build.xml 5 Mar 2003 22:12:41 - 1.124
+++ build.xml 13 Mar 2003 19:03:18 - 1.125
@@ -120,6 +120,10 @@
include name=stylebook*.jar/
include name=xalan*.jar/
/fileset
+fileset dir=lib
+ include name=xerces*.jar/
+ include name=xml-apis.jar/
+/fileset
/path
1.2 +184 -206 xml-batik/lib/build/stylebook-1.0-b3_xalan-2.jar
Binary file
1.6 +15 -0
xml-batik/resources/org/apache/batik/dom/svg/resources/dtdids.properties
Index: dtdids.properties
===
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/dom/svg/resources/dtdids.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dtdids.properties 19 Nov 2002 08:00:13 - 1.5
+++ dtdids.properties 13 Mar 2003 19:03:19 - 1.6
@@ -13,6 +13,21 @@
-//W3C//DTD SVG 1.1 Basic//EN\
-//W3C//DTD SVG 1.1 Tiny//EN
+#
+# The skippablePublicIds property represents the list of SVG DTD's we
+# can safely skip if we are not validating. Since SVG may move to
+# schema you shouldn't count on any entities from these files anyways.
+#
+skippablePublicIds = \
+-//W3C//DTD SVG 1.0//EN\
+-//W3C//DTD SVG 20010904//EN\
+-//W3C//DTD SVG 20001102//EN\
+-//W3C//DTD SVG 2802//EN\
+-//W3C//DTD SVG 2303 Stylable//EN\
+-//W3C//DTD SVG 1.1//EN\
+-//W3C//DTD SVG 1.1 Basic//EN\
+-//W3C//DTD SVG 1.1 Tiny//EN
+
systemId.-//W3C//DTD_SVG_1.0//EN = resources/svg10.dtd
systemId.-//W3C//DTD_SVG_20010904//EN = resources/svg10.dtd
systemId.-//W3C//DTD_SVG_20001102//EN = resources/svg10.dtd
1.19 +30 -6
xml-batik/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java
Index: SAXSVGDocumentFactory.java
===
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SAXSVGDocumentFactory.java12 Nov 2002 12:32:06 - 1.18
+++ SAXSVGDocumentFactory.java13 Mar 2003 19:03:19 - 1.19
@@ -11,6 +11,7 @@
import java.io.InputStream;
import java.io.IOException;
import java.io.Reader;
+import java.io.ByteArrayInputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -51,6 +52,11 @@
public static final String KEY_PUBLIC_IDS = publicIds;
/**
+ * Key used for public identifiers
+ */
+public static final String KEY_SKIPPABLE_PUBLIC_IDS = skippablePublicIds;
+
+/**
* Key used for system identifiers
*/
public static final String KEY_SYSTEM_ID = systemId.;
@@ -72,6 +78,11 @@
protected static String dtdids;
/**
+ * The DTD public IDs we know we can skip.
+ */
+protected static String skippable_dtdids;
+
+/**
* The ResourceBunder for the public and system ids
*/
protected static ResourceBundle rb;
@@ -297,15 +308,28 @@
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
try {
-if (dtdids == null) {
-rb = ResourceBundle.getBundle(DTDIDS,
- Locale.getDefault());
+if (rb == null)
+rb = ResourceBundle.getBundle(DTDIDS, Locale.getDefault());
+
+if (dtdids == null)
dtdids = rb.getString(KEY_PUBLIC_IDS);
-}
+
+if (skippable_dtdids == null)
+skippable_dtdids = rb.getString(KEY_SKIPPABLE_PUBLIC_IDS);
+
if (publicId != null){
+if (!isValidating
+(skippable_dtdids.indexOf(publicId) != -1)) {
+// We are not validating and this is a DTD we can
+// safely skip so do it...
+byte [] bytes = new byte[0];
+return new InputSource(new
