cziegeler 01/06/07 02:20:15
Modified: src/org/apache/cocoon/transformation Tag: cocoon_20_branch
TraxTransformer.java
Log:
Applied the patch from Rick Tessner ([EMAIL PROTECTED]) for uri resolving from inside
the stylesheets
Revision Changes Path
No revision
No revision
1.15.2.1 +3 -9
xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- TraxTransformer.java 2001/06/01 06:19:56 1.15
+++ TraxTransformer.java 2001/06/07 09:20:11 1.15.2.1
@@ -100,7 +100,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: TraxTransformer.java,v 1.15 2001/06/01 06:19:56 cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.15.2.1 2001/06/07 09:20:11 cziegeler
Exp $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable, URIResolver {
@@ -274,7 +274,7 @@
+ new File(parent.getParentFile(),
href).getAbsolutePath());
}
}
- return new
javax.xml.transform.stream.StreamSource(xslSource.getInputStream());
+ return new
javax.xml.transform.stream.StreamSource(xslSource.getInputStream(),
xslSource.getSystemId());
} catch (IOException e) {
throw new javax.xml.transform.TransformerException(e);
} catch (SAXException e) {
@@ -288,13 +288,7 @@
if(tfactory == null) {
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
- // FIXME (CZ)
- // The current Xalan Version 2.1.0 passes sometimes only
- // a null pointer to the resolve method as the base argument.
- // So we can add this if the problem is solved.
- // Until then resolving of our special urls will not work
- // using include of the stylesheets.
- // tfactory.setURIResolver(this);
+ tfactory.setURIResolver(this);
}
return tfactory;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
