greenrd 01/03/22 11:58:28
Modified: . changes.xml
src/org/apache/cocoon/processor/xsp XSPProcessor.java
Log:
fixed encoding bug with logicsheets
Revision Changes Path
1.222 +6 -2 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- changes.xml 2001/03/08 23:05:07 1.221
+++ changes.xml 2001/03/22 19:58:26 1.222
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.221 2001/03/08 23:05:07 greenrd Exp $
+ $Id: changes.xml,v 1.222 2001/03/22 19:58:26 greenrd Exp $
-->
<changes title="History of Changes">
@@ -18,7 +18,11 @@
</devs>
<release version="@version@" date="@date@">
- <action dev="RDG" type="update" due-to="Eric A. Sirois"
due-to-email="[EMAIL PROTECTED]">
+ <action dev="RDG" type="fix" due-to="Krzysztof Zielinski"
+ due-to-email="[EMAIL PROTECTED]">
+ Non-default encodings in logicsheets should now work.
+ </action>
+ <action dev="RDG" type="fix" due-to="Eric A. Sirois" due-to-email="[EMAIL
PROTECTED]">
XSLTProcessor now recognises text/xml and application/xml mime-types in
<?xml-stylesheet?> PIs
as stylesheets, not just text/xsl.
</action>
1.41 +6 -6
xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPProcessor.java
Index: XSPProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPProcessor.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XSPProcessor.java 2001/02/05 20:01:55 1.40
+++ XSPProcessor.java 2001/03/22 19:58:27 1.41
@@ -1,4 +1,4 @@
-/*-- $Id: XSPProcessor.java,v 1.40 2001/02/05 20:01:55 balld Exp $ --
+/*-- $Id: XSPProcessor.java,v 1.41 2001/03/22 19:58:27 greenrd Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -78,7 +78,7 @@
* This class implements the XSP engine.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version $Revision: 1.40 $ $Date: 2001/02/05 20:01:55 $
+ * @version $Revision: 1.41 $ $Date: 2001/03/22 19:58:27 $
*/
public class XSPProcessor extends AbstractActor
implements Processor, Configurable, Status, Cacheable
@@ -606,10 +606,10 @@
input.setSystemId(resource.toString());
if (resource instanceof File) {
- input.setCharacterStream(new FileReader(((File) resource)));
+ input.setByteStream(new FileInputStream (((File) resource)));
} else if (resource instanceof URL) {
- input.setCharacterStream(
- new InputStreamReader(((URL) resource).openStream())
+ input.setByteStream(
+ ((URL) resource).openStream()
);
} else {
// should never happen
@@ -617,7 +617,7 @@
"Fatal error: Could not elaborate given resource: " + resource
);
}
-
+
// do not validate stylesheets
return this.parser.parse(input, false);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
