cziegeler 02/01/07 06:08:41
Modified: . changes.xml
src/java/org/apache/cocoon/components/xpath
JaxenProcessorImpl.java XPathProcessor.java
XPathProcessorImpl.java
Log:
Fixed xpath processor interface and uppdated changes
Revision Changes Path
1.64 +7 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- changes.xml 21 Dec 2001 15:20:19 -0000 1.63
+++ changes.xml 7 Jan 2002 14:08:41 -0000 1.64
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.63 2001/12/21 15:20:19 sylvain Exp $
+ $Id: changes.xml,v 1.64 2002/01/07 14:08:41 cziegeler Exp $
-->
<changes title="History of Changes">
@@ -29,6 +29,12 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="add">
+ Added special lifecycle interface for Cocoon components: RequestLifecycle.
+ A component marked by this interface has the lifecycle of one request,
+ so looking up the role twice during the same request results in the same
+ component.
+ </action>
<action dev="SW" type="update">
The "namespace-prefixes" feature is no more set on parsers. It can be set if
needed in the configuration.
1.2 +2 -8
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java
Index: JaxenProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JaxenProcessorImpl.java 3 Jan 2002 12:31:15 -0000 1.1
+++ JaxenProcessorImpl.java 7 Jan 2002 14:08:41 -0000 1.2
@@ -7,16 +7,10 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
-import org.apache.avalon.framework.component.Component;
-
import org.apache.avalon.framework.logger.AbstractLoggable;
-
import org.w3c.dom.Node;
-
import org.w3c.dom.NodeList;
-
-
import java.util.List;
/**
@@ -32,11 +26,11 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:15 $ $Author: giacomo $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/07 14:08:41 $ $Author: cziegeler $
*/
public class JaxenProcessorImpl
extends AbstractLoggable
- implements XPathProcessor, Component
+ implements XPathProcessor
{
/**
* Use an XPath string to select a single node. XPath namespace
1.2 +4 -2
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessor.java
Index: XPathProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathProcessor.java 3 Jan 2002 12:31:15 -0000 1.1
+++ XPathProcessor.java 7 Jan 2002 14:08:41 -0000 1.2
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
+import org.apache.avalon.framework.component.Component;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -14,9 +15,10 @@
* This is the interface of the XPath processor in Cocoon.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:15 $ $Author: giacomo $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/07 14:08:41 $ $Author: cziegeler $
*/
-public interface XPathProcessor {
+public interface XPathProcessor
+extends Component {
/**
* The role implemented by an <code>XSLTProcessor</code>.
*/
1.2 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathProcessorImpl.java 3 Jan 2002 12:31:15 -0000 1.1
+++ XPathProcessorImpl.java 7 Jan 2002 14:08:41 -0000 1.2
@@ -7,7 +7,6 @@
*****************************************************************************/
package org.apache.cocoon.components.xpath;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Node;
@@ -26,11 +25,11 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:15 $ $Author: giacomo $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/07 14:08:41 $ $Author: cziegeler $
*/
public class XPathProcessorImpl
extends AbstractLoggable
- implements XPathProcessor, Component
+ implements XPathProcessor
{
/**
* Use an XPath string to select a single node. XPath namespace
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
