X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/TemplateSet.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/TemplateSet.java
index ab30dd3..3ddf18f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/TemplateSet.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/TemplateSet.java
@@ -22,11 +22,16 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.Serializer;
-import org.apache.xml.serialize.SerializerFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -218,16 +223,27 @@ public class TemplateSet {
         node.appendChild(pattern);
       }
 
-      OutputFormat format = new OutputFormat();
-      format.setPreserveSpace(true);
-      Serializer serializer = SerializerFactory.getSerializerFactory("xml").makeSerializer(stream, format); //$NON-NLS-1$
-      serializer.asDOMSerializer().serialize(document);
+      Transformer transformer=TransformerFactory.newInstance().newTransformer();
+	  transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
+	  transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
+	  DOMSource source = new DOMSource(document);
+	  StreamResult result = new StreamResult(stream);
+
+	  transformer.transform(source, result);
+      
+//      OutputFormat format = new OutputFormat();
+//      format.setPreserveSpace(true);
+//      Serializer serializer = SerializerFactory.getSerializerFactory("xml").makeSerializer(stream, format); //$NON-NLS-1$
+//      serializer.asDOMSerializer().serialize(document);
 
     } catch (ParserConfigurationException e) {
       throwWriteException(e);
-    } catch (IOException e) {
-      throwWriteException(e);
-    }
+    } catch (TransformerException e) {
+		throwWriteException(e);
+	}
+//    } catch (IOException e) {
+//      throwWriteException(e);
+//    }
   }
 
   private static void throwReadException(Throwable t) throws CoreException {