bloritsch 01/02/07 11:16:49
Modified: . Tag: xml-cocoon2 build.bat build.sh
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPUtil.java
Added: lib Tag: xml-cocoon2 xerces_1_2_3.jar
Removed: lib Tag: xml-cocoon2 xerces_1_3_0.jar
Log:
Got a little zealous today.... Backing down to Xerces 1.2.3 (messes up FOP and
converts   incorrectly), and replacing the getDocument method of XSPUtil.
Revision Changes Path
No revision
No revision
1.10.2.21 +2 -2 xml-cocoon/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-cocoon/build.bat,v
retrieving revision 1.10.2.20
retrieving revision 1.10.2.21
diff -u -r1.10.2.20 -r1.10.2.21
--- build.bat 2001/02/07 18:03:35 1.10.2.20
+++ build.bat 2001/02/07 19:16:46 1.10.2.21
@@ -2,7 +2,7 @@
::
-----------------------------------------------------------------------------
:: build.bat - Win32 Build Script for Apache Cocoon
::
-:: $Id: build.bat,v 1.10.2.20 2001/02/07 18:03:35 bloritsch Exp $
+:: $Id: build.bat,v 1.10.2.21 2001/02/07 19:16:46 bloritsch Exp $
::
-----------------------------------------------------------------------------
:: ----- Verify and Set Required Environment Variables
-------------------------
@@ -18,7 +18,7 @@
:: ----- Set Up The Runtime Classpath
------------------------------------------
-set
CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\ant_1_2.jar;.\lib\xerces_1_3_0.jar
+set
CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\ant_1_2.jar;.\lib\xerces_1_2_3.jar
:: ----- Execute The Requested Build
-------------------------------------------
1.10.2.22 +2 -2 xml-cocoon/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-cocoon/build.sh,v
retrieving revision 1.10.2.21
retrieving revision 1.10.2.22
diff -u -r1.10.2.21 -r1.10.2.22
--- build.sh 2001/02/07 18:03:36 1.10.2.21
+++ build.sh 2001/02/07 19:16:46 1.10.2.22
@@ -2,7 +2,7 @@
#
-----------------------------------------------------------------------------
# build.sh - Unix Build Script for Apache Cocoon
#
-# $Id: build.sh,v 1.10.2.21 2001/02/07 18:03:36 bloritsch Exp $
+# $Id: build.sh,v 1.10.2.22 2001/02/07 19:16:46 bloritsch Exp $
#
-----------------------------------------------------------------------------
# ----- Verify and Set Required Environment Variables
-------------------------
@@ -18,7 +18,7 @@
# ----- Set Up The Runtime Classpath
------------------------------------------
-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/ant_1_2.jar:./lib/xerces_1_3_0.jar
+CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/ant_1_2.jar:./lib/xerces_1_2_3.jar
# ----- Make sure Ant script is executable
------------------------------------
No revision
No revision
1.1.2.3 +0 -0 xml-cocoon/lib/xerces_1_2_3.jar
<<Binary file>>
No revision
No revision
1.1.2.5 +10 -0
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XSPUtil.java 2001/02/07 17:44:15 1.1.2.4
+++ XSPUtil.java 2001/02/07 19:16:49 1.1.2.5
@@ -36,12 +36,13 @@
import org.apache.cocoon.xml.AbstractXMLConsumer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
+import org.apache.cocoon.xml.dom.DOMBuilder;
/**
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.1.2.4 $ $Date: 2001/02/07 17:44:15 $
+ * @version $Revision: 1.1.2.5 $ $Date: 2001/02/07 19:16:49 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -129,6 +130,15 @@
new IncludeXMLConsumer(parentContentHandler));
parser.parse(is);
}
+
+ public static org.w3c.dom.Document getDocument(InputSource input, Parser
parser)
+ throws SAXException, IOException {
+ DOMBuilder builder = new DOMBuilder(parser);
+ parser.setContentHandler(builder);
+ parser.setLexicalHandler(builder);
+ parser.parse(input);
+ return builder.getDocument();
+ }
public static String encodeMarkup(String string) {
char[] array = string.toCharArray();
