Index: plugin.xml
===================================================================
RCS file: /cvsroot/webtools/wst/components/dtd/plugins/org.eclipse.wst.dtd.ui/plugin.xml,v
retrieving revision 1.45
diff -u -r1.45 plugin.xml
--- plugin.xml	15 Feb 2007 03:38:36 -0000	1.45
+++ plugin.xml	17 Oct 2007 22:04:27 -0000
@@ -217,6 +217,10 @@
 			class="org.eclipse.wst.dtd.ui.internal.templates.TemplateContextTypeDTD"
 			id="dtd_new">
 		</contextType>
+  <include
+        file="templates/dtddefault-templates.xml"
+        translations="$nl$/templates/dtddefault-templates.properties">
+  </include>
 	</extension>
 
    <extension
Index: src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/dtd/plugins/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java,v
retrieving revision 1.1
diff -u -r1.1 TemplateContextTypeDTD.java
--- src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java	21 Jun 2005 18:16:24 -0000	1.1
+++ src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java	17 Oct 2007 22:04:27 -0000
@@ -7,11 +7,13 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     David Carver, STAR - added Encoding Content Resolver, bug 162321
  *******************************************************************************/
 package org.eclipse.wst.dtd.ui.internal.templates;
 
 import org.eclipse.jface.text.templates.GlobalTemplateVariables;
 import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.wst.xml.ui.internal.templates.EncodingTemplateVariableResolverXML;
 
 /**
  * Base class for DTD template context types. Templates of this context type
@@ -29,5 +31,6 @@
 		addResolver(new GlobalTemplateVariables.User());
 		addResolver(new GlobalTemplateVariables.WordSelection());
 		addResolver(new GlobalTemplateVariables.Year());
+		addResolver(new EncodingTemplateVariableResolverXML());
 	}
 }
Index: templates/dtddefault-templates.xml
===================================================================
RCS file: templates/dtddefault-templates.xml
diff -N templates/dtddefault-templates.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/dtddefault-templates.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2007 Standards for Technology in Automotive Retail and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     David Carver - STAR - initial contribution, bug 162321
+ *******************************************************************************/
+ -->
+<templates>
+  <template name="%Templates.xmldeclaration.name" description="%Templates.xmldeclaration.desc" id="org.eclipse.wst.dtd.ui.internal.templates.xmldeclaration" context="dtd_new" enabled="true">&lt;?xml version="1.0" encoding="${encoding}"?&gt;</template>
+</templates>
Index: templates/dtddefault-templates.properties
===================================================================
RCS file: templates/dtddefault-templates.properties
diff -N templates/dtddefault-templates.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/dtddefault-templates.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2007 STAR Standards for Technology in Automotive Retail
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     David Carver, STAR - initial API and implementation, bug 162321
+#     
+###############################################################################
+Templates.xmldeclaration.name=xml declaration
+Templates.xmldeclaration.desc=xml declaration