greenrd 00/12/01 15:36:44
Modified: . changes.xml
src/org/apache/cocoon/processor/xsp XSPProcessor.java
src/org/apache/cocoon/processor/xslt XSLTProcessor.java
Log:
changed ENVIRONMENT to XSP-ENVIRONMENT to reduce likelihood of name collision
Revision Changes Path
1.159 +2 -2 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- changes.xml 2000/12/01 22:54:40 1.158
+++ changes.xml 2000/12/01 23:36:43 1.159
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.158 2000/12/01 22:54:40 greenrd Exp $
+ $Id: changes.xml,v 1.159 2000/12/01 23:36:43 greenrd Exp $
-->
<changes title="History of Changes">
@@ -19,7 +19,7 @@
<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
+ Passed extra parameters to style- and logic- sheets - XSP-ENVIRONMENT
("Cocoon @version@") and XSP-VERSION (1.0)
</action>
<action dev="RDG" type="fix">
1.33 +3 -3
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XSPProcessor.java 2000/12/01 22:54:41 1.32
+++ XSPProcessor.java 2000/12/01 23:36:44 1.33
@@ -1,4 +1,4 @@
-/*-- $Id: XSPProcessor.java,v 1.32 2000/12/01 22:54:41 greenrd Exp $ --
+/*-- $Id: XSPProcessor.java,v 1.33 2000/12/01 23:36:44 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.32 $ $Date: 2000/12/01 22:54:41 $
+ * @version $Revision: 1.33 $ $Date: 2000/12/01 23:36:44 $
*/
public class XSPProcessor extends AbstractActor
implements Processor, Configurable, Status, Cacheable
@@ -391,7 +391,7 @@
Hashtable logicsheetParameters = new Hashtable();
logicsheetParameters.put("filename", filename);
logicsheetParameters.put("language", languageName);
- logicsheetParameters.put("ENVIRONMENT", Cocoon.version ());
+ logicsheetParameters.put("XSP-ENVIRONMENT", Cocoon.version ());
logicsheetParameters.put("XSP-VERSION", version());
// Apply each logicsheet in sequence
1.24 +3 -3
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XSLTProcessor.java 2000/12/01 23:14:21 1.23
+++ XSLTProcessor.java 2000/12/01 23:36:44 1.24
@@ -1,4 +1,4 @@
-/*-- $Id: XSLTProcessor.java,v 1.23 2000/12/01 23:14:21 greenrd Exp $ --
+/*-- $Id: XSLTProcessor.java,v 1.24 2000/12/01 23:36:44 greenrd Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -75,7 +75,7 @@
* This class implements an XSLT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.23 $ $Date: 2000/12/01 23:14:21 $
+ * @version $Revision: 1.24 $ $Date: 2000/12/01 23:36:44 $
*/
public class XSLTProcessor implements Actor, Processor, Status, Defaults,
Cacheable {
@@ -106,7 +106,7 @@
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-ENVIRONMENT", Cocoon.version());
params.put ("XSP-VERSION", XSPProcessor.version());
try {
