dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1920
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: trunk
timestamp: Wed 2010-08-11 15:58:23 +0100
message:
  Reverted to using uri resolver for the transformer.  This forces all relative file references within an xslt to resolve relative to location manager home (DHIS_HOME)
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java	2010-07-28 13:44:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java	2010-08-11 14:58:23 +0000
@@ -39,6 +39,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
 
 import org.amplecode.staxwax.factory.XMLFactory;
@@ -86,6 +87,9 @@
     @Autowired
     private XSLTLocator xsltLocator;
 
+    @Autowired
+    URIResolver resolver;
+
     public QName getDocumentRoot(BufferedInputStream xmlDataStream) throws ImportException
     {
         QName rootName = null;
@@ -143,8 +147,7 @@
         {
             TransformerTask tt = new TransformerTask( sheet, xsltParams );
 
-            // tt.transform( source, result, resolver );
-            tt.transform( source, result, null );
+            tt.transform( source, result, resolver );
             log.debug( "Transform successful" );
 
         } catch ( Exception ex )