cziegeler 02/03/13 08:28:02
Modified: . changes.xml
src/java/org/apache/cocoon cocoon.roles
src/java/org/apache/cocoon/components/xpath
JaxenProcessorImpl.java XPathProcessor.java
XPathProcessorImpl.java
src/java/org/apache/cocoon/generation HTMLGenerator.java
src/java/org/apache/cocoon/i18n XMLResourceBundle.java
src/java/org/apache/cocoon/transformation
XIncludeTransformer.java
src/webapp cocoon.xconf
Log:
Deprecating XPath Processing, using Excalibur version instead
Revision Changes Path
1.117 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- changes.xml 13 Mar 2002 08:58:41 -0000 1.116
+++ changes.xml 13 Mar 2002 16:28:02 -0000 1.117
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.116 2002/03/13 08:58:41 cziegeler Exp $
+ $Id: changes.xml,v 1.117 2002/03/13 16:28:02 cziegeler Exp $
-->
<changes title="History of Changes">
@@ -32,6 +32,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="update">
+ Using migrated XPath Processor from Avalon Excalibur instead of own component.
+ </action>
<action dev="CZ" type="fix">
Fixed endless loop bug in IncludeXMLConsumer.
</action>
1.15 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cocoon.roles 13 Mar 2002 13:44:56 -0000 1.14
+++ cocoon.roles 13 Mar 2002 16:28:02 -0000 1.15
@@ -25,9 +25,9 @@
shorthand="xslt-processor"
default-class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"/>
- <role name="org.apache.cocoon.components.xpath.XPathProcessor"
+ <role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor"
shorthand="xpath-processor"
- default-class="org.apache.cocoon.components.xpath.XPathProcessorImpl"/>
+ default-class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
<role name="org.apache.cocoon.components.browser.Browser"
shorthand="browser"
1.8 +2 -1
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JaxenProcessorImpl.java 9 Mar 2002 06:44:50 -0000 1.7
+++ JaxenProcessorImpl.java 13 Mar 2002 16:28:02 -0000 1.8
@@ -70,9 +70,10 @@
* <xslt-processor
class="org.apache.cocoon.components.xpath.JaxenProcessorImpl">
* </xslt-processor>
* </pre>
+ * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl
instead.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: JaxenProcessorImpl.java,v 1.7 2002/03/09 06:44:50 vgritsenko
Exp $
+ * @version CVS $Id: JaxenProcessorImpl.java,v 1.8 2002/03/13 16:28:02 cziegeler
Exp $
*/
public class JaxenProcessorImpl
extends AbstractLoggable
1.6 +2 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathProcessor.java 22 Feb 2002 07:00:14 -0000 1.5
+++ XPathProcessor.java 13 Mar 2002 16:28:02 -0000 1.6
@@ -57,8 +57,9 @@
/**
* This is the interface of the XPath processor in Cocoon.
*
+ * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.XPathProcessor instead.
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: XPathProcessor.java,v 1.5 2002/02/22 07:00:14 cziegeler Exp $
+ * @version CVS $Id: XPathProcessor.java,v 1.6 2002/03/13 16:28:02 cziegeler Exp $
*/
public interface XPathProcessor
extends Component {
1.7 +2 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathProcessorImpl.java 22 Feb 2002 07:00:14 -0000 1.6
+++ XPathProcessorImpl.java 13 Mar 2002 16:28:02 -0000 1.7
@@ -68,8 +68,9 @@
* </xslt-processor>
* </pre>
*
+ * @deprecated Use the org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl
instead.
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: XPathProcessorImpl.java,v 1.6 2002/02/22 07:00:14 cziegeler
Exp $
+ * @version CVS $Id: XPathProcessorImpl.java,v 1.7 2002/03/13 16:28:02 cziegeler
Exp $
*/
public class XPathProcessorImpl
extends AbstractLoggable
1.13 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTMLGenerator.java 22 Feb 2002 07:03:51 -0000 1.12
+++ HTMLGenerator.java 13 Mar 2002 16:28:02 -0000 1.13
@@ -61,7 +61,7 @@
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.TimeStampCacheValidity;
-import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
@@ -89,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
- * @version CVS $Id: HTMLGenerator.java,v 1.12 2002/02/22 07:03:51 cziegeler Exp $
+ * @version CVS $Id: HTMLGenerator.java,v 1.13 2002/03/13 16:28:02 cziegeler Exp $
*/
public class HTMLGenerator extends ComposerGenerator
implements Cacheable, Disposable {
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLResourceBundle.java 22 Feb 2002 07:03:52 -0000 1.6
+++ XMLResourceBundle.java 13 Mar 2002 16:28:02 -0000 1.7
@@ -56,7 +56,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.log.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -74,7 +74,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Oleg Podolsky</a>
- * @version $Id: XMLResourceBundle.java,v 1.6 2002/02/22 07:03:52 cziegeler Exp $
+ * @version $Id: XMLResourceBundle.java,v 1.7 2002/03/13 16:28:02 cziegeler Exp $
*/
public class XMLResourceBundle
extends ResourceBundle
1.11 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XIncludeTransformer.java 11 Mar 2002 11:15:25 -0000 1.10
+++ XIncludeTransformer.java 13 Mar 2002 16:28:02 -0000 1.11
@@ -58,7 +58,7 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.IncludeXMLConsumer;
@@ -83,7 +83,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Id: XIncludeTransformer.java,v 1.10 2002/03/11 11:15:25 cziegeler
Exp $
+ * @version CVS $Id: XIncludeTransformer.java,v 1.11 2002/03/13 16:28:02 cziegeler
Exp $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Disposable {
1.39 +1 -1 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cocoon.xconf 10 Mar 2002 04:54:31 -0000 1.38
+++ cocoon.xconf 13 Mar 2002 16:28:02 -0000 1.39
@@ -142,7 +142,7 @@
<!-- Xpath Processor:
-->
- <xpath-processor class="org.apache.cocoon.components.xpath.XPathProcessorImpl"
+ <xpath-processor class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath-processor"/>
<!-- URL Factory:
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
