diff -r be8fbcfed1c8 projectuiapi/apichanges.xml
--- a/projectuiapi/apichanges.xml	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/apichanges.xml	Tue Mar 25 13:57:06 2008 +0100
@@ -104,6 +104,19 @@ is the proper place.
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        
+        <change id="project-encoding-property">
+           <api name="general"/>
+           <summary>Adding template attribute <code>project.encoding</code></summary>
+           <version major="1" minor="29"/>
+           <date day="26" month="3" year="2008"/>
+           <author login="abadea"/>
+           <compatibility addition="yes"/>
+           <description>
+                Added the template attribute <code>project.license</code> for templates using scripting language.
+           </description>
+           <issue number="129685"/>
+        </change>
         
         <change id="folder-based-privileged-templates">
             <api name="general"/>
diff -r be8fbcfed1c8 projectuiapi/arch.xml
--- a/projectuiapi/arch.xml	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/arch.xml	Tue Mar 25 13:57:06 2008 +0100
@@ -687,8 +687,10 @@ Nothing.
        attributes from
        <code>org.openide.loaders.CreateFromTemplateAttributesProvider</code>s
        registered in project lookups.
-       It provides
-       <a href="#property-project.license">project.license</a> attribute for file templates using scripting support.
+       It provides the
+       <a href="#property-project.license">project.license</a> and
+       <a href="#property-project.encoding">project.encoding</a> 
+       attributes for file templates using scripting support.
      </api>
   </p>
    <p>
@@ -697,6 +699,12 @@ Nothing.
        <a href="#lookup-org.openide.loaders.CreateFromTemplateAttributesProvider">templates</a>.
        It is used to import license templates.
        The <code>default</code> is used if the attribute was not found in any
+       project lookup.
+     </api>
+     <api group="property" name="project.encoding" type="export" category="official">
+       <code>project.encoding</code> attribute contains the project encoding as <code>String</code> for newly created
+       <a href="#lookup-org.openide.loaders.CreateFromTemplateAttributesProvider">templates</a>.
+       The encoding of the parent folder of the new file is used if the attribute was not found in any
        project lookup.
      </api>
    </p>
diff -r be8fbcfed1c8 projectuiapi/nbproject/project.properties
--- a/projectuiapi/nbproject/project.properties	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/nbproject/project.properties	Tue Mar 25 13:57:06 2008 +0100
@@ -39,7 +39,7 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.5
-spec.version.base=1.28.0
+spec.version.base=1.29.0
 is.autoload=true
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff -r be8fbcfed1c8 projectuiapi/nbproject/project.xml
--- a/projectuiapi/nbproject/project.xml	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/nbproject/project.xml	Tue Mar 25 13:57:06 2008 +0100
@@ -154,6 +154,7 @@ made subject to such option by the copyr
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.openide.util</code-name-base>
+                        <compile-dependency/>
                         <test/>
                     </test-dependency>
                     <test-dependency>
diff -r be8fbcfed1c8 projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java
--- a/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java	Tue Mar 25 13:57:06 2008 +0100
@@ -41,11 +41,14 @@
 
 package org.netbeans.modules.project.uiapi;
 
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.Project;
+import org.netbeans.api.queries.FileEncodingQuery;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.CreateFromTemplateAttributesProvider;
 import org.openide.loaders.DataFolder;
 import org.openide.loaders.DataObject;
@@ -60,7 +63,8 @@ public final class ProjectTemplateAttrib
     
     private static final String ATTR_PROJECT = "project"; // NOI18N
     private static final String ATTR_LICENSE = "license"; // NOI18N
-
+    private static final String ATTR_ENCODING = "encoding"; // NOI18N
+    
     public Map<String, ? extends Object> attributesFor(
             DataObject template, DataFolder target, String name) {
         
@@ -78,18 +82,18 @@ public final class ProjectTemplateAttrib
             }
         }
         
-        return checkProjectLicense(all);
+        return checkProjectAttrs(all, target.getPrimaryFile());
     }
     
-    static Map<String, ? extends Object> checkProjectLicense(Map<String, Object> m) {
+    static Map<String, ? extends Object> checkProjectAttrs(Map<String, Object> m, FileObject parent) {
         Object prjAttrObj = m != null? m.get(ATTR_PROJECT): null;
         if (prjAttrObj instanceof Map) {
             @SuppressWarnings("unchecked")
             Map<String, Object> prjAttrs = (Map<String, Object>) prjAttrObj;
-            if (prjAttrs.get(ATTR_LICENSE) == null) {
+            if (prjAttrs.get(ATTR_LICENSE) == null || prjAttrs.get(ATTR_ENCODING) == null) {
                 Map<String, Object> newPrjAttrs = new HashMap<String, Object>(prjAttrs);
                 m.put(ATTR_PROJECT, newPrjAttrs);
-                newPrjAttrs.put(ATTR_LICENSE, "default"); // NOI18N
+                ensureProjectAttrs(newPrjAttrs, parent);
             }
             return m;
         }
@@ -97,11 +101,26 @@ public final class ProjectTemplateAttrib
             // What can we do?
             return m;
         }
-        Map<String, String> licenseMap = Collections.singletonMap(ATTR_LICENSE, "default"); // NOI18N
+        Map<String, Object> projectMap = new HashMap<String, Object>();
+        ensureProjectAttrs(projectMap, parent);
         if (m != null) {
-            m.put(ATTR_PROJECT, licenseMap); // NOI18N
+            m.put(ATTR_PROJECT, projectMap); // NOI18N
             return m;
         }
-        return Collections.singletonMap(ATTR_PROJECT, licenseMap);
+        return Collections.singletonMap(ATTR_PROJECT, projectMap);
+    }
+    
+    private static void ensureProjectAttrs(Map<String, Object> map, FileObject parent) {
+        if (map.get(ATTR_LICENSE) == null) {
+            map.put(ATTR_LICENSE, "default"); // NOI18N
+        }
+        if (map.get(ATTR_ENCODING) == null) {
+            Charset charset = FileEncodingQuery.getEncoding(parent);
+            String encoding = charset != null ? charset.name() : "UTF-8"; // NOI18N
+            map.put(ATTR_ENCODING, encoding);
+        }
     }
 }
diff -r be8fbcfed1c8 projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProviderTest.java
--- a/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProviderTest.java	Tue Mar 25 11:36:37 2008 +0100
+++ b/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProviderTest.java	Tue Mar 25 13:57:06 2008 +0100
@@ -39,46 +39,96 @@
 
 package org.netbeans.modules.project.uiapi;
 
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import junit.framework.TestCase;
+import org.netbeans.api.project.TestUtil;
+import org.netbeans.api.queries.FileEncodingQuery;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.spi.queries.FileEncodingQueryImplementation;
+import org.openide.filesystems.FileObject;
+import org.openide.util.test.MockLookup;
 
 /**
  *
  * @author Andrei Badea
  */
-public class ProjectTemplateAttributesProviderTest extends TestCase {
+public class ProjectTemplateAttributesProviderTest extends NbTestCase {
+
+    private FileObject scratch;
+    private FileObject folder;
 
     public ProjectTemplateAttributesProviderTest(String testName) {
         super(testName);
     }
 
-    public void testCheckProjectLicense() {
-        Map<String, ? extends Object> checked = ProjectTemplateAttributesProvider.checkProjectLicense(null);
-        assertLicense("default", checked);
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        scratch = TestUtil.makeScratchDir(this);
+        folder = scratch.createFolder("folder");
+        MockLookup.setInstances(new FEQImpl());
+        assertEquals(FEQImpl.ENCODING, FileEncodingQuery.getEncoding(folder).name());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        MockLookup.setInstances();
+        super.tearDown();
+    }
+
+    public void testcheckProjectAttrs() throws Exception {
+        Map<String, ? extends Object> checked = ProjectTemplateAttributesProvider.checkProjectAttrs(null, folder);
+        assertAttribute("default", checked, "license");
+        assertAttribute(FEQImpl.ENCODING, checked, "encoding");
 
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("foo", "bar");
 
-        checked = ProjectTemplateAttributesProvider.checkProjectLicense(map);
-        assertLicense("default", checked);
+        checked = ProjectTemplateAttributesProvider.checkProjectAttrs(map, folder);
+        assertAttribute("default", checked, "license");
+        assertAttribute(FEQImpl.ENCODING, checked, "encoding");
         assertEquals("bar", checked.get("foo"));
 
         map.put("project", Collections.emptyMap());
-        checked = ProjectTemplateAttributesProvider.checkProjectLicense(map);
-        assertLicense("default", checked);
+        checked = ProjectTemplateAttributesProvider.checkProjectAttrs(map, folder);
+        assertAttribute("default", checked, "license");
+        assertAttribute(FEQImpl.ENCODING, checked, "encoding");
         assertEquals("bar", checked.get("foo"));
 
         map.put("project", Collections.singletonMap("license", "gpl"));
-        checked = ProjectTemplateAttributesProvider.checkProjectLicense(map);
-        assertLicense("gpl", checked);
+        checked = ProjectTemplateAttributesProvider.checkProjectAttrs(map, folder);
+        assertAttribute("gpl", checked, "license");
+        assertAttribute(FEQImpl.ENCODING, checked, "encoding");
+        assertEquals("bar", checked.get("foo"));
+
+        Map<String, String> projectMap = new HashMap<String, String>();
+        projectMap.put("license", "gpl");
+        projectMap.put("encoding", "UTF-8");
+        map.put("project", projectMap);
+        checked = ProjectTemplateAttributesProvider.checkProjectAttrs(map, folder);
+        assertAttribute("gpl", checked, "license");
+        assertAttribute("UTF-8", checked, "encoding");
         assertEquals("bar", checked.get("foo"));
     }
 
-    private static void assertLicense(String license, Map<String, ? extends Object> map) {
+    private static void assertAttribute(String expected, Map<String, ? extends Object> map, String attribute) {
         @SuppressWarnings("unchecked")
         Map<String, Object> attrs = (Map<String, Object>) map.get("project");
-        assertEquals(license, attrs.get("license"));
+        assertEquals(expected, attrs.get(attribute));
+    }
+
+    private final class FEQImpl extends FileEncodingQueryImplementation {
+
+        public static final String ENCODING = "ISO-8859-1";
+
+        @Override
+        public Charset getEncoding(FileObject file) {
+            if (file == folder) {
+                return Charset.forName(ENCODING);
+            }
+            return null;
+        }
     }
 }