bloritsch 2003/03/11 13:44:49
Modified: . gump.xml
src/test/org/apache/cocoon/components/source
SourceResolverAdapter.java
Log:
upgrade the gump descriptors to reflect changes in Excalibur
Revision Changes Path
1.8 +2 -2 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/gump.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gump.xml 11 Mar 2003 03:18:27 -0000 1.7
+++ gump.xml 11 Mar 2003 21:44:48 -0000 1.8
@@ -27,7 +27,7 @@
<depend project="xml-xalan2" version="supplied"/>
<depend project="xml-commons-resolver" version="supplied"/>
- <depend project="excalibur-cli" version="supplied"/>
+ <depend project="excalibur-compatibility" version="supplied"/>
<depend project="excalibur-instrument" version="supplied"/>
<depend project="excalibur-instrument-manager" version="supplied"/>
<depend project="excalibur-naming" version="supplied"/>
@@ -38,7 +38,7 @@
<depend project="excalibur-datasource" version="supplied"/>
<depend project="excalibur-component" version="supplied"/>
<depend project="excalibur-logger" version="supplied"/>
- <depend project="excalibur-collections" version="supplied"/>
+ <!-- <depend project="excalibur-collections" version="supplied"/> -->
<depend project="avalon-cornerstone" version="supplied"/>
1.2 +2 -16
cocoon-2.1/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
Index: SourceResolverAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceResolverAdapter.java 9 Mar 2003 00:10:38 -0000 1.1
+++ SourceResolverAdapter.java 11 Mar 2003 21:44:49 -0000 1.2
@@ -170,24 +170,10 @@
* @param source the data
* @throws ProcessingException if no suitable converter is found
*/
- public void toSAX( org.apache.excalibur.source.Source source,
- String mimeType,
+ public void toSAX( org.apache.excalibur.source.Source source, String mimeType,
ContentHandler handler )
throws SAXException, IOException, ProcessingException {
- SAXParser parser = null;
- org.apache.excalibur.source.Source assertionsource = null;
-
- try {
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
-
- parser.parse(new InputSource(source.getInputStream()), handler);
- } catch (ComponentException ce) {
- throw new ProcessingException("Couldn't xmlize source", ce);
- } catch (org.apache.excalibur.source.SourceException se) {
- throw new ProcessingException("Couldn't xmlize source", se);
- } finally {
- this.manager.release((Component) parser);
- }
+ this.toSAX( source, handler );
}
}
