cziegeler 2003/01/14 01:29:30
Modified: src/scratchpad/src/org/apache/cocoon/generation
XPathDirectoryGenerator.java
RequestAttributeGenerator.java
src/java/org/apache/cocoon/components/deli DeliImpl.java
src/java/org/apache/cocoon cocoon.roles
src/scratchpad/src/org/apache/cocoon/components/repository/impl
SlideRepository.java
lib/core excalibur-xmlutil-20030114.jar
src/scratchpad/src/org/apache/cocoon/components/source/impl
XPathSourceInspector.java
src/java/org/apache/cocoon/components/xscript
XScriptObject.java
src/scratchpad/src/org/apache/cocoon/components/axis
SoapServerImpl.java
src/java/org/apache/cocoon/components/resolver
ResolverImpl.java
Log:
Updating to changed interfaces in excalibur
Revision Changes Path
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathDirectoryGenerator.java 14 Jan 2003 09:00:28 -0000 1.7
+++ XPathDirectoryGenerator.java 14 Jan 2003 09:29:28 -0000 1.8
@@ -57,7 +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.apache.excalibur.xml.dom.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
1.4 +3 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestAttributeGenerator.java 14 Jan 2003 09:00:28 -0000 1.3
+++ RequestAttributeGenerator.java 14 Jan 2003 09:29:28 -0000 1.4
@@ -55,6 +55,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.excalibur.xml.sax.Parser;
@@ -168,7 +169,7 @@
throw new ProcessingException("Exception in
RequestAttributeGenerator.generate()", e);
} finally {
if (parser != null) {
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
}
}
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DeliImpl.java 14 Jan 2003 09:00:28 -0000 1.21
+++ DeliImpl.java 14 Jan 2003 09:29:28 -0000 1.22
@@ -69,7 +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.apache.excalibur.xml.dom.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
1.42 +6 -1 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cocoon.roles 14 Jan 2003 09:00:28 -0000 1.41
+++ cocoon.roles 14 Jan 2003 09:29:28 -0000 1.42
@@ -13,11 +13,16 @@
]>
<role-list>
+
<role name="org.apache.excalibur.xml.sax.Parser"
shorthand="xml-parser"
default-class="org.apache.excalibur.xml.sax.JaxpParser"/>
- <role name="org.apache.avalon.excalibur.xml.EntityResolver"
+ <role name="org.apache.excalibur.xml.dom.Parser"
+ shorthand="dom-parser"
+ default-class="org.apache.excalibur.xml.sax.JaxpParser"/>
+
+ <role name="org.apache.excalibur.xml.EntityResolver"
shorthand="entity-resolver"
default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
1.7 +3 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SlideRepository.java 14 Jan 2003 09:00:28 -0000 1.6
+++ SlideRepository.java 14 Jan 2003 09:29:28 -0000 1.7
@@ -56,6 +56,7 @@
package org.apache.cocoon.components.repository.impl;
import org.apache.avalon.framework.activity.Disposable;
+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;
@@ -161,7 +162,7 @@
if (source!=null)
resolver.release(source);
if (parser!=null)
- this.manager.release(parser);
+ this.manager.release((Component)parser);
if (resolver!=null)
this.manager.release(resolver);
}
1.3 +115 -91 xml-cocoon2/lib/core/excalibur-xmlutil-20030114.jar
<<Binary file>>
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathSourceInspector.java 14 Jan 2003 09:00:29 -0000 1.5
+++ XPathSourceInspector.java 14 Jan 2003 09:29:29 -0000 1.6
@@ -67,7 +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.apache.excalibur.xml.dom.Parser;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -124,7 +124,7 @@
this.getLogger().error("Could not retrieve component", ce);
} finally {
if (parser!=null)
- this.manager.release(parser);
+ this.manager.release((Component)parser);
}
if (doc != null) {
1.14 +3 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XScriptObject.java 14 Jan 2003 09:00:28 -0000 1.13
+++ XScriptObject.java 14 Jan 2003 09:29:29 -0000 1.14
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.components.xscript;
+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;
@@ -168,7 +169,7 @@
throw new SAXException(e);
} finally {
if (parser != null) {
- componentManager.release(parser);
+ componentManager.release((Component)parser);
}
}
}
1.6 +4 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SoapServerImpl.java 14 Jan 2003 09:00:28 -0000 1.5
+++ SoapServerImpl.java 14 Jan 2003 09:29:29 -0000 1.6
@@ -66,6 +66,7 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
+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;
@@ -99,7 +100,7 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.excalibur.xml.sax.Parser;
+import org.apache.excalibur.xml.dom.Parser;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -425,7 +426,7 @@
finally
{
if (resolver != null) m_manager.release(resolver);
- if (parser != null) m_manager.release(parser);
+ if (parser != null) m_manager.release((Component)parser);
}
}
1.18 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ResolverImpl.java 19 Dec 2002 07:01:40 -0000 1.17
+++ ResolverImpl.java 14 Jan 2003 09:29:30 -0000 1.18
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.resolver;
-import org.apache.avalon.excalibur.xml.EntityResolver;
+import org.apache.excalibur.xml.EntityResolver;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
