cziegeler 2003/01/14 01:00:30
Modified: src/deprecated/java/org/apache/cocoon/components/source
AbstractStreamSource.java
src/blocks/bsf/java/org/apache/cocoon/generation
ScriptGenerator.java
src/java/org/apache/cocoon/components/deli DeliImpl.java
src/java/org/apache/cocoon/generation
WebServiceProxyGenerator.java StreamGenerator.java
src/java/org/apache/cocoon/components/xscript
XScriptObject.java
src/scratchpad/src/org/apache/cocoon/components/axis
SoapServerImpl.java
src/scratchpad/src/org/apache/cocoon/generation
XPathDirectoryGenerator.java
RequestAttributeGenerator.java
src/java/org/apache/cocoon cocoon.roles Cocoon.java
src/scratchpad/src/org/apache/cocoon/components/repository/impl
SlideRepository.java
lib/core excalibur-xmlutil-20030114.jar
src/java/org/apache/cocoon/xml/dom DOMUtil.java
src/scratchpad/src/org/apache/cocoon/transformation/pagination
Paginator.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context
RequestSessionContext.java
src/scratchpad/src/org/apache/cocoon/components/source/impl
XPathSourceInspector.java
src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneXMLIndexerImpl.java
src/blocks/velocity/java/org/apache/cocoon/generation
VelocityGenerator.java
Log:
Updating to changed interfaces of excalibur - sigh
Revision Changes Path
1.2 +4 -3
xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/source/AbstractStreamSource.java
Index: AbstractStreamSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/source/AbstractStreamSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractStreamSource.java 26 Dec 2002 18:38:56 -0000 1.1
+++ AbstractStreamSource.java 14 Jan 2003 09:00:28 -0000 1.2
@@ -55,12 +55,13 @@
package org.apache.cocoon.components.source;
-import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -206,7 +207,7 @@
throw new ProcessingException("Exception during processing of "
+ this.getSystemId(), e);
} finally {
- if (parser != null) this.manager.release(parser);
+ if (parser != null) this.manager.release( (Component)parser);
}
}
1.3 +5 -3
xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptGenerator.java 7 Jan 2003 23:17:07 -0000 1.2
+++ ScriptGenerator.java 14 Jan 2003 09:00:28 -0000 1.3
@@ -53,7 +53,8 @@
import com.ibm.bsf.BSFException;
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.util.IOUtils;
-import org.apache.avalon.excalibur.xml.Parser;
+
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -62,6 +63,7 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.InputSource;
import java.io.FileNotFoundException;
@@ -216,7 +218,7 @@
throw new ProcessingException(
"Exception in ScriptGenerator.generate()", e);
} finally {
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
}
}
1.21 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DeliImpl.java 5 Dec 2002 09:27:50 -0000 1.20
+++ DeliImpl.java 14 Jan 2003 09:00:28 -0000 1.21
@@ -54,7 +54,6 @@
import com.hp.hpl.deli.ProfileAttribute;
import com.hp.hpl.deli.Workspace;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
@@ -70,6 +69,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Request;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
1.8 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
Index: WebServiceProxyGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebServiceProxyGenerator.java 9 Jan 2003 15:49:42 -0000 1.7
+++ WebServiceProxyGenerator.java 14 Jan 2003 09:00:28 -0000 1.8
@@ -56,7 +56,7 @@
import java.util.Enumeration;
import java.util.Map;
-import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -73,6 +73,7 @@
import org.apache.commons.httpclient.methods.UrlPostMethod;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -174,7 +175,7 @@
}
finally
{
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
} // generate
1.13 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StreamGenerator.java 5 Dec 2002 10:32:57 -0000 1.12
+++ StreamGenerator.java 14 Jan 2003 09:00:28 -0000 1.13
@@ -50,11 +50,12 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.util.PostInputStream;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -169,7 +170,7 @@
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
StreamGenerator.generate()", e);
} finally {
- this.manager.release(parser);
+ this.manager.release( (Component)parser);
}
}
1.13 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObject.java
Index: XScriptObject.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObject.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XScriptObject.java 9 Jan 2003 09:00:57 -0000 1.12
+++ XScriptObject.java 14 Jan 2003 09:00:28 -0000 1.13
@@ -55,13 +55,13 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.xslt.XSLTProcessor;
import org.apache.avalon.excalibur.xml.xslt.XSLTProcessorException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.xml.EmbeddedXMLPipe;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
1.5 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java
Index: SoapServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/axis/SoapServerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SoapServerImpl.java 7 Jan 2003 23:56:13 -0000 1.4
+++ SoapServerImpl.java 14 Jan 2003 09:00:28 -0000 1.5
@@ -78,8 +78,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.excalibur.xml.Parser;
-
import org.apache.axis.AxisEngine;
import org.apache.axis.Constants;
import org.apache.axis.EngineConfiguration;
@@ -101,6 +99,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
1.7 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Index: XPathDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathDirectoryGenerator.java 7 Jan 2003 23:56:14 -0000 1.6
+++ XPathDirectoryGenerator.java 14 Jan 2003 09:00:28 -0000 1.7
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.parameters.Parameters;
@@ -58,6 +57,7 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
1.3 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/RequestAttributeGenerator.java
Index: RequestAttributeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/RequestAttributeGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestAttributeGenerator.java 7 Jan 2003 23:56:14 -0000 1.2
+++ RequestAttributeGenerator.java 14 Jan 2003 09:00:28 -0000 1.3
@@ -55,10 +55,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.excalibur.xml.Parser;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.41 +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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cocoon.roles 14 Jan 2003 08:32:00 -0000 1.40
+++ cocoon.roles 14 Jan 2003 09:00:28 -0000 1.41
@@ -13,9 +13,9 @@
]>
<role-list>
- <role name="org.apache.avalon.excalibur.xml.Parser"
+ <role name="org.apache.excalibur.xml.sax.Parser"
shorthand="xml-parser"
- default-class="org.apache.avalon.excalibur.xml.JaxpParser"/>
+ default-class="org.apache.excalibur.xml.sax.JaxpParser"/>
<role name="org.apache.avalon.excalibur.xml.EntityResolver"
shorthand="entity-resolver"
1.47 +5 -5 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Cocoon.java 14 Jan 2003 08:32:00 -0000 1.46
+++ Cocoon.java 14 Jan 2003 09:00:28 -0000 1.47
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.logger.LogKitManageable;
@@ -84,6 +83,7 @@
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.impl.URLSource;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.InputSource;
import java.io.BufferedInputStream;
@@ -348,7 +348,7 @@
} catch (Exception e) {
throw new ConfigurationException("Error trying to load configurations",
e);
} finally {
- if (p != null) startupManager.release(p);
+ if (p != null) startupManager.release((Component)p);
}
DefaultRoleManager drm = new DefaultRoleManager();
@@ -365,7 +365,7 @@
} catch (Exception e) {
throw new ConfigurationException("Error trying to load
configurations",e);
} finally {
- if (p != null) startupManager.release(p);
+ if (p != null) startupManager.release((Component)p);
}
Configuration conf = this.configuration;
@@ -400,7 +400,7 @@
} catch (Exception e) {
throw new ConfigurationException("Error trying to load user-roles
configuration", e);
} finally {
- startupManager.release(p);
+ startupManager.release((Component)p);
}
DefaultRoleManager urm = new DefaultRoleManager(drm);
1.6 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlideRepository.java
Index: SlideRepository.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/impl/SlideRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SlideRepository.java 7 Jan 2003 23:56:13 -0000 1.5
+++ SlideRepository.java 14 Jan 2003 09:00:28 -0000 1.6
@@ -67,12 +67,11 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.excalibur.xml.Parser;
-
import org.apache.cocoon.components.repository.Repository;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.xml.sax.Parser;
import org.apache.slide.common.EmbeddedDomain;
1.2 +207 -200 xml-cocoon2/lib/core/excalibur-xmlutil-20030114.jar
<<Binary file>>
1.7 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOMUtil.java 16 Dec 2002 10:01:11 -0000 1.6
+++ DOMUtil.java 14 Jan 2003 09:00:29 -0000 1.7
@@ -52,12 +52,12 @@
import org.apache.excalibur.source.SourceParameters;
import org.apache.xpath.XPathAPI;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.XMLizable;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.xpath.XPathUtil;
import org.apache.cocoon.xml.IncludeXMLConsumer;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.*;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.15 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java
Index: Paginator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Paginator.java 7 Jan 2003 23:56:15 -0000 1.14
+++ Paginator.java 14 Jan 2003 09:00:29 -0000 1.15
@@ -61,8 +61,6 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.xml.Parser;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -76,6 +74,7 @@
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.excalibur.store.Store;
+import org.apache.excalibur.xml.sax.Parser;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
1.4 +3 -2
xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
Index: RequestSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestSessionContext.java 7 Jan 2003 20:48:35 -0000 1.3
+++ RequestSessionContext.java 14 Jan 2003 09:00:29 -0000 1.4
@@ -55,7 +55,7 @@
import java.util.Enumeration;
import java.util.Map;
-import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -67,6 +67,7 @@
import org.apache.cocoon.xml.dom.DOMUtil;
import org.apache.excalibur.source.SourceParameters;
import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
@@ -191,7 +192,7 @@
} catch (ComponentException ce) {
throw new ProcessingException("Unable to lookup parser.", ce);
} finally {
- manager.release( parser );
+ manager.release( (Component)parser );
}
this.buildAttributesXML(root);
this.buildMiscXML(root);
1.5 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathSourceInspector.java 7 Jan 2003 23:56:14 -0000 1.4
+++ XPathSourceInspector.java 14 Jan 2003 09:00:29 -0000 1.5
@@ -55,7 +55,6 @@
package org.apache.cocoon.components.source.impl;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -68,6 +67,7 @@
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.xml.sax.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
1.2 +4 -3
xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
Index: SimpleLuceneXMLIndexerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleLuceneXMLIndexerImpl.java 18 Dec 2002 23:44:51 -0000 1.1
+++ SimpleLuceneXMLIndexerImpl.java 14 Jan 2003 09:00:29 -0000 1.2
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.search;
-import org.apache.avalon.excalibur.xml.Parser;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -61,6 +61,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.util.Tokenizer;
+import org.apache.excalibur.xml.sax.Parser;
import org.apache.lucene.document.DateField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -319,7 +320,7 @@
throw new ProcessingException("Cannot lookup xml parser!", ce);
} finally {
if (parser != null) {
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
}
}
1.2 +4 -3
xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityGenerator.java 26 Dec 2002 14:01:46 -0000 1.1
+++ VelocityGenerator.java 14 Jan 2003 09:00:30 -0000 1.2
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -66,6 +66,7 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.collections.ExtendedProperties;
import org.apache.excalibur.source.Source;
+import org.apache.excalibur.xml.sax.Parser;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
@@ -538,7 +539,7 @@
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
VelocityGenerator.generate()", e);
} finally {
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
