You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/05/27 11:13:37 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
bodewig 02/05/27 02:13:36
Modified: . Tag: ANT_15_BRANCH build.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
XSLTProcess.java
Log:
Remove direct TraX compile-time dependency from <style>.
There still is an indirect dependency via XMLCatalog, of course.
Revision Changes Path
No revision
No revision
1.304.2.10 +1 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.304.2.9
retrieving revision 1.304.2.10
diff -u -r1.304.2.9 -r1.304.2.10
--- build.xml 27 May 2002 08:47:25 -0000 1.304.2.9
+++ build.xml 27 May 2002 09:13:36 -0000 1.304.2.10
@@ -1275,7 +1275,7 @@
<!-- these tests need to be localised before being ran???? -->
<exclude name="${optional.package}/PvcsTest.java" />
- <!-- ehm, these are not really a TraX test but rather a xalan2 test..-->
+ <!-- ehm, these are not really TraX tests but rather xalan2 tests..-->
<exclude name="${optional.package}/TraXLiaisonTest.java"
unless="xalan2.present"/>
<exclude name="${optional.package}/XsltTest.java"
No revision
No revision
1.43.2.2 +11 -6 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -r1.43.2.1 -r1.43.2.2
--- XSLTProcess.java 24 May 2002 15:47:57 -0000 1.43.2.1
+++ XSLTProcess.java 27 May 2002 09:13:36 -0000 1.43.2.2
@@ -67,13 +67,12 @@
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.types.XMLCatalog;
import org.xml.sax.EntityResolver;
-import javax.xml.transform.URIResolver;
/**
* A Task to process via XSLT a set of XML documents. This is
* useful for building views of XML based documentation.
*
- * @version $Revision: 1.43.2.1 $
+ * @version $Revision: 1.43.2.2 $
*
* @author <a href="mailto:kvisco@exoffice.com">Keith Visco</a>
* @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
@@ -662,6 +661,12 @@
Param p = (Param) e.nextElement();
liaison.addParam(p.getName(), p.getExpression());
}
+ } catch (Exception ex) {
+ log("Failed to read stylesheet " + stylesheet, Project.MSG_INFO);
+ throw new BuildException(ex);
+ }
+
+ try {
// if liaison is a TraxLiason, use XMLCatalog as the entity
// resolver and URI resolver
if (liaison.getClass().getName().equals(TRAX_LIAISON_CLASS) &&
@@ -675,12 +680,12 @@
resolver = liaison.getClass()
.getDeclaredMethod("setURIResolver",
- new Class[] {URIResolver.class});
+ new Class[] {loadClass("javax.xml.transform.URIResolver")});
resolver.invoke(liaison, new Object[] {xmlCatalog});
}
- } catch (Exception ex) {
- log("Failed to read stylesheet " + stylesheet, Project.MSG_INFO);
- throw new BuildException(ex);
+ } catch (Exception e) {
+ throw new BuildException("Failed to configure XMLCatalog for "
+ + "TraxLiaison", e);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>