greenrd 00/12/01 14:54:42
Modified: . changes.xml
src/org/apache/cocoon/processor/xsp XSPProcessor.java
src/org/apache/cocoon/processor/xslt XSLTProcessor.java
Log:
passing env params to logic and style sheets
Revision Changes Path
1.158 +4 -0 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- changes.xml 2000/12/01 17:59:27 1.157
+++ changes.xml 2000/12/01 22:54:40 1.158
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.157 2000/12/01 17:59:27 greenrd Exp $
+ $Id: changes.xml,v 1.158 2000/12/01 22:54:40 greenrd Exp $
-->
<changes title="History of Changes">
@@ -18,6 +18,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="RDG" type="add" due-to="Donald Ball" due-to-email="[EMAIL
PROTECTED]">
+ Passed extra parameters to style- and logic- sheets - ENVIRONMENT
+ ("Cocoon @version@") and XSP-VERSION (1.0)
+ </action>
<action dev="RDG" type="fix">
Added inefficient workaround for using Xalan 1.x with FOP > 0.13.
See src/org/apache/cocoon/formatter/FO2PDFFormatter.java.
1.32 +7 -0
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XSPProcessor.java 2000/12/01 18:01:12 1.31
+++ XSPProcessor.java 2000/12/01 22:54:41 1.32
@@ -1,4 +1,4 @@
-/*-- $Id: XSPProcessor.java,v 1.31 2000/12/01 18:01:12 greenrd Exp $ --
+/*-- $Id: XSPProcessor.java,v 1.32 2000/12/01 22:54:41 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.31 $ $Date: 2000/12/01 18:01:12 $
+ * @version $Revision: 1.32 $ $Date: 2000/12/01 22:54:41 $
*/
public class XSPProcessor extends AbstractActor
implements Processor, Configurable, Status, Cacheable
@@ -104,6 +104,11 @@
protected XSPGlobal global;
protected ServletContext servletContext;
+ /** Version of XSP spec in use. */
+ public static String version () {
+ return "1.0";
+ }
+
public XSPProcessor() {
this.global = new XSPGlobal();
}
@@ -386,6 +391,8 @@
Hashtable logicsheetParameters = new Hashtable();
logicsheetParameters.put("filename", filename);
logicsheetParameters.put("language", languageName);
+ logicsheetParameters.put("ENVIRONMENT", Cocoon.version ());
+ logicsheetParameters.put("XSP-VERSION", version());
// Apply each logicsheet in sequence
Vector logicsheetList = pageEntry.getLogicsheets();
1.22 +3 -0
xml-cocoon/src/org/apache/cocoon/processor/xslt/XSLTProcessor.java
Index: XSLTProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xslt/XSLTProcessor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XSLTProcessor.java 2000/12/01 17:48:38 1.21
+++ XSLTProcessor.java 2000/12/01 22:54:41 1.22
@@ -1,4 +1,4 @@
-/*-- $Id: XSLTProcessor.java,v 1.21 2000/12/01 17:48:38 greenrd Exp $ --
+/*-- $Id: XSLTProcessor.java,v 1.22 2000/12/01 22:54:41 greenrd Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -62,6 +62,7 @@
import org.apache.cocoon.parser.*;
import org.apache.cocoon.logger.*;
import org.apache.cocoon.processor.*;
+import org.apache.cocoon.processor.xsp.XSPProcessor;
import org.apache.cocoon.framework.*;
import org.apache.cocoon.transformer.*;
import org.xml.sax.InputSource;
@@ -73,7 +74,7 @@
* This class implements an XSLT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.21 $ $Date: 2000/12/01 17:48:38 $
+ * @version $Revision: 1.22 $ $Date: 2000/12/01 22:54:41 $
*/
public class XSLTProcessor implements Actor, Processor, Status, Defaults,
Cacheable {
@@ -104,6 +105,8 @@
String path = (String) parameters.get("path");
String browser = (String) parameters.get("browser");
Hashtable params = this.filterParameters(request);
+ params.put ("ENVIRONMENT", Cocoon.version());
+ params.put ("XSP-VERSION", XSPProcessor.version());
try {
Object resource = getResource(context, request, response,
document, path, browser);
