balld 01/01/22 18:01:32
Modified: . changes.xml
src/org/apache/cocoon/processor/xsp XSPProcessor.java
Log:
fixed this bug -
the XSPProcessor instantiates a XSPLogicSheet with sheetBase 'null'.
This causes an error with the Saxon XSLT transformer.
Revision Changes Path
1.189 +5 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- changes.xml 2001/01/23 01:23:49 1.188
+++ changes.xml 2001/01/23 02:01:30 1.189
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.188 2001/01/23 01:23:49 balld Exp $
+ $Id: changes.xml,v 1.189 2001/01/23 02:01:30 balld Exp $
-->
<changes title="History of Changes">
@@ -18,6 +18,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="DB" type="fix" due-to="Steffen Stundzig" due-to-email="[EMAIL
PROTECTED]">
+ Patched XSPProcessor - it was instantiating a XSPLogicSheet with
sheetBase 'null', causing problems with SAXON.
+ </action>
+ <action dev="DB" type="fix" due-to="Peter Haight" due-to-email="[EMAIL
PROTECTED]">
<action dev="DB" type="fix" due-to="Kirk Woerner" due-to-email="[EMAIL
PROTECTED]">
Patched XIncludeProcessor to handle non-DOM2 nodes resulting from XSLT
transformation.
</action>
1.39 +7 -4
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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XSPProcessor.java 2001/01/18 23:06:40 1.38
+++ XSPProcessor.java 2001/01/23 02:01:31 1.39
@@ -1,4 +1,4 @@
-/*-- $Id: XSPProcessor.java,v 1.38 2001/01/18 23:06:40 greenrd Exp $ --
+/*-- $Id: XSPProcessor.java,v 1.39 2001/01/23 02:01:31 balld 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.38 $ $Date: 2001/01/18 23:06:40 $
+ * @version $Revision: 1.39 $ $Date: 2001/01/23 02:01:31 $
*/
public class XSPProcessor extends AbstractActor
implements Processor, Configurable, Status, Cacheable
@@ -166,7 +166,6 @@
try {
String languageName = t.nextToken();
Configurations c = conf.getConfigurations(languageName);
- XSPLogicsheet logicsheet = new XSPLogicsheet(transformer,
parser, null);
// Make XSP Processor class configurable via cocoon.properties
(i.e. compiler)
Configurations cc = c.getConfigurations("processor");
@@ -180,6 +179,10 @@
InputStream logicsheetInputStream =
this.getClass().getResourceAsStream(logicsheetName);
if (logicsheetInputStream == null)
throw new Exception("Resource '" + logicsheetName + "' could
not be found.");
+
+ XSPLogicsheet logicsheet = new XSPLogicsheet(transformer,
parser,
+ this.getClass().getResource(logicsheetName).toString());
+
logicsheet.setStylesheet(this.parser.parse(new
InputSource(logicsheetInputStream)));
String preprocessorName = (String) c.get("preprocessor");
@@ -473,7 +476,7 @@
node = node.getNextSibling();
}
String sourceCode = languageProcessor.formatCode(buffer.toString());
-
+
sourceCode = languageProcessor.formatCode(sourceCode);
// Store source code in repository
