cziegeler 2003/01/14 00:32:01
Modified: src/java/org/apache/cocoon/environment
AbstractEnvironment.java
src/java/org/apache/cocoon cocoon.roles Cocoon.java
src/java/org/apache/cocoon/components/source SourceUtil.java
lib jars.xml
Added: lib/core excalibur-xmlutil-20030114.jar
Removed: lib/core excalibur-xmlutil-20020820.jar
Log:
Updating to latest excalibur xmlutil
Revision Changes Path
1.31 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AbstractEnvironment.java 24 Sep 2002 08:32:57 -0000 1.30
+++ AbstractEnvironment.java 14 Jan 2003 08:32:00 -0000 1.31
@@ -540,8 +540,6 @@
handler );
} catch (SourceException se) {
throw SourceUtil.handle(se);
- } catch (ComponentException ce) {
- throw new ProcessingException("Exception during streaming source.",
ce);
}
}
}
1.40 +1 -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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cocoon.roles 9 Jan 2003 05:39:11 -0000 1.39
+++ cocoon.roles 14 Jan 2003 08:32:00 -0000 1.40
@@ -106,7 +106,7 @@
<role name="org.apache.excalibur.xmlizer.XMLizer"
shorthand="xmlizer"
- default-class="org.apache.excalibur.xmlizer.impl.XMLizerImpl"/>
+ default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
<role name="org.apache.avalon.excalibur.monitor.Monitor"
shorthand="monitor"
1.46 +2 -2 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Cocoon.java 10 Jan 2003 10:42:00 -0000 1.45
+++ Cocoon.java 14 Jan 2003 08:32:00 -0000 1.46
@@ -463,7 +463,7 @@
public void dispose() {
this.componentManager.release(this.threadSafeProcessor);
this.componentManager.release(this.sourceResolver);
- this.componentManager.release(this.xmlizer);
+ this.componentManager.release((Component)this.xmlizer);
this.sourceResolver = null;
this.xmlizer = null;
this.componentManager.dispose();
1.1 xml-cocoon2/lib/core/excalibur-xmlutil-20030114.jar
<<Binary file>>
1.11 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java
Index: SourceUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SourceUtil.java 5 Dec 2002 10:17:29 -0000 1.10
+++ SourceUtil.java 14 Jan 2003 08:32:01 -0000 1.11
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.components.source;
+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.parameters.Parameters;
@@ -119,7 +120,7 @@
} catch (ComponentException ce) {
throw new ProcessingException("Exception during streaming source.",
ce);
} finally {
- manager.release( xmlizer );
+ manager.release( (Component)xmlizer );
}
}
}
1.65 +1 -1 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- jars.xml 10 Jan 2003 13:04:21 -0000 1.64
+++ jars.xml 14 Jan 2003 08:32:01 -0000 1.65
@@ -171,7 +171,7 @@
<description>Part of jakarta-avalon, it is a set of classes and patterns that
support high level server development.</description>
<used-by>Cocoon</used-by>
- <lib>core/excalibur-xmlutil-20020820.jar</lib>
+ <lib>core/excalibur-xmlutil-20030114.jar</lib>
<homepage>http://jakarta.apache.org/avalon/excalibur/</homepage>
</file>
<file>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
