You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by st...@locus.apache.org on 2000/03/05 23:24:40 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/transformer Transformer.java XTTransformer.java XalanTransformer.java
stefano 00/03/05 14:24:40
Modified: src/org/apache/cocoon/processor/xsp XSPTemplate.java
src/org/apache/cocoon/transformer Transformer.java
XTTransformer.java XalanTransformer.java
Log:
Fixed a problem with Xalan not recognizing fully our parameters, also changed Hashtable in more abstract Dictionary
Revision Changes Path
1.7 +4 -9 xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPTemplate.java
Index: XSPTemplate.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPTemplate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSPTemplate.java 2000/02/13 18:29:34 1.6
+++ XSPTemplate.java 2000/03/05 22:24:38 1.7
@@ -1,4 +1,4 @@
-/*-- $Id: XSPTemplate.java,v 1.6 2000/02/13 18:29:34 stefano Exp $ --
+/*-- $Id: XSPTemplate.java,v 1.7 2000/03/05 22:24:38 stefano Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -60,7 +60,7 @@
/**
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version $Revision: 1.6 $ $Date: 2000/02/13 18:29:34 $
+ * @version $Revision: 1.7 $ $Date: 2000/03/05 22:24:38 $
*/
public class XSPTemplate {
protected String languageName;
@@ -108,18 +108,13 @@
document = this.preprocessor.preprocess(document, parameters);
}
-/*
-System.err.println(XSPUtil.toMarkup(this.transformer.transform(document, stylesheet, this.parser.createEmptyDocument())));
-*/
-
- // FIXME: we should change these nulls to something meaningful to allow
- // the transformers to do includes and imports.
return this.transformer.transform(
document,
(String) parameters.get("filename"),
stylesheet,
this.templateBase,
- this.parser.createEmptyDocument()
+ this.parser.createEmptyDocument(),
+ parameters
);
}
}
1.5 +3 -3 xml-cocoon/src/org/apache/cocoon/transformer/Transformer.java
Index: Transformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformer/Transformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Transformer.java 2000/03/04 02:36:00 1.4
+++ Transformer.java 2000/03/05 22:24:38 1.5
@@ -1,4 +1,4 @@
-/*-- $Id: Transformer.java,v 1.4 2000/03/04 02:36:00 stefano Exp $ --
+/*-- $Id: Transformer.java,v 1.5 2000/03/05 22:24:38 stefano Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -58,7 +58,7 @@
* This interface is implemented by all XSLT tranformers.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.4 $ $Date: 2000/03/04 02:36:00 $
+ * @version $Revision: 1.5 $ $Date: 2000/03/05 22:24:38 $
*/
public interface Transformer extends Actor {
@@ -69,6 +69,6 @@
*/
public Document transform(Document document, String documentBase,
Document sheet, String sheetBase,
- Document result, Hashtable parameters) throws Exception;
+ Document result, Dictionary parameters) throws Exception;
}
1.6 +2 -2 xml-cocoon/src/org/apache/cocoon/transformer/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformer/XTTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XTTransformer.java 2000/03/04 02:36:00 1.5
+++ XTTransformer.java 2000/03/05 22:24:39 1.6
@@ -1,4 +1,4 @@
-/*-- $Id: XTTransformer.java,v 1.5 2000/03/04 02:36:00 stefano Exp $ --
+/*-- $Id: XTTransformer.java,v 1.6 2000/03/05 22:24:39 stefano Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -76,7 +76,7 @@
public class XTTransformer extends AbstractActor implements Transformer, Status {
public Document transform(Document document, String documentBase,
- Document sheet, String sheetBase, Document result, Hashtable params)
+ Document sheet, String sheetBase, Document result, Dictionary params)
throws Exception {
Transform transformer = new XSLTransformEngine().createTransform(sheet);
transformer.transform(document, result);
1.10 +4 -4 xml-cocoon/src/org/apache/cocoon/transformer/XalanTransformer.java
Index: XalanTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformer/XalanTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanTransformer.java 2000/03/04 02:36:00 1.9
+++ XalanTransformer.java 2000/03/05 22:24:39 1.10
@@ -1,4 +1,4 @@
-/*-- $Id: XalanTransformer.java,v 1.9 2000/03/04 02:36:00 stefano Exp $ --
+/*-- $Id: XalanTransformer.java,v 1.10 2000/03/05 22:24:39 stefano Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -69,7 +69,7 @@
* Xalan XSLT processor.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.9 $ $Date: 2000/03/04 02:36:00 $
+ * @version $Revision: 1.10 $ $Date: 2000/03/05 22:24:39 $
*/
public class XalanTransformer extends AbstractActor implements Transformer, Status {
@@ -82,14 +82,14 @@
}
public Document transform(Document in, String inBase, Document sheet,
- String sheetBase, Document out, Hashtable params)
+ String sheetBase, Document out, Dictionary params)
throws Exception {
XSLTProcessor processor = XSLTProcessorFactory.getProcessor(new XMLParser(parser));
Enumeration enum = params.keys();
while (enum.hasMoreElements()) {
String name = (String) enum.nextElement();
- processor.setStylesheetParam(name, processor.createXString((String) params.get(name)));
+ processor.setStylesheetParam(name, (String) params.get(name));
}
XSLTInputSource i = new XSLTInputSource(in);