Index: web/jsf/src/org/netbeans/modules/web/jsf/resources/templates/JSFManagedBean.template
===================================================================
RCS file: /cvs/web/jsf/src/org/netbeans/modules/web/jsf/resources/templates/JSFManagedBean.template,v
retrieving revision 1.5
diff -u -r1.5 JSFManagedBean.template
--- web/jsf/src/org/netbeans/modules/web/jsf/resources/templates/JSFManagedBean.template	12 Jun 2007 14:52:08 -0000	1.5
+++ web/jsf/src/org/netbeans/modules/web/jsf/resources/templates/JSFManagedBean.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleFilter.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleFilter.template,v
retrieving revision 1.5
diff -u -r1.5 SimpleFilter.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleFilter.template	19 Jun 2007 14:50:57 -0000	1.5
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleFilter.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -255,4 +255,4 @@
     }
 
     private static final boolean debug = true;
-}
\ No newline at end of file
+}
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/ServletListener.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/ServletListener.template,v
retrieving revision 1.3
diff -u -r1.3 ServletListener.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/ServletListener.template	12 Jun 2007 14:52:06 -0000	1.3
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/ServletListener.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -13,4 +13,4 @@
  */
 
 public class ${name} {
-}
\ No newline at end of file
+}
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleTagHandler.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleTagHandler.template,v
retrieving revision 1.7
diff -u -r1.7 SimpleTagHandler.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleTagHandler.template	19 Jun 2007 14:50:57 -0000	1.7
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/SimpleTagHandler.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -46,4 +46,4 @@
         }
 
     }
-}
\ No newline at end of file
+}
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/Servlet.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/Servlet.template,v
retrieving revision 1.12
diff -u -r1.12 Servlet.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/Servlet.template	13 Jul 2007 11:26:48 -0000	1.12
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/Servlet.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/AdvancedFilter.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/AdvancedFilter.template,v
retrieving revision 1.5
diff -u -r1.5 AdvancedFilter.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/AdvancedFilter.template	19 Jun 2007 14:50:57 -0000	1.5
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/AdvancedFilter.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
  
 <#if package?? && package != "">
 package ${package};
Index: web/core/src/org/netbeans/modules/web/core/resources/templates/BodyTagHandler.template
===================================================================
RCS file: /cvs/web/core/src/org/netbeans/modules/web/core/resources/templates/BodyTagHandler.template,v
retrieving revision 1.6
diff -u -r1.6 BodyTagHandler.template
--- web/core/src/org/netbeans/modules/web/core/resources/templates/BodyTagHandler.template	19 Jun 2007 14:50:57 -0000	1.6
+++ web/core/src/org/netbeans/modules/web/core/resources/templates/BodyTagHandler.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
  
 <#if package?? && package != "">
 package ${package};
Index: web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsActionForm.template
===================================================================
RCS file: /cvs/web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsActionForm.template,v
retrieving revision 1.4
diff -u -r1.4 StrutsActionForm.template
--- web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsActionForm.template	29 Jun 2007 14:12:33 -0000	1.4
+++ web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsActionForm.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsAction.template
===================================================================
RCS file: /cvs/web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsAction.template,v
retrieving revision 1.5
diff -u -r1.5 StrutsAction.template
--- web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsAction.template	29 Jun 2007 14:12:32 -0000	1.5
+++ web/struts/src/org/netbeans/modules/web/struts/resources/templates/StrutsAction.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -40,4 +40,4 @@
         return mapping.findForward(SUCCESS);
         
     }
-}
\ No newline at end of file
+}
Index: web/struts/src/org/netbeans/modules/web/struts/resources/templates/LookupDispatchAction.template
===================================================================
RCS file: /cvs/web/struts/src/org/netbeans/modules/web/struts/resources/templates/LookupDispatchAction.template,v
retrieving revision 1.4
diff -u -r1.4 LookupDispatchAction.template
--- web/struts/src/org/netbeans/modules/web/struts/resources/templates/LookupDispatchAction.template	29 Jun 2007 14:12:32 -0000	1.4
+++ web/struts/src/org/netbeans/modules/web/struts/resources/templates/LookupDispatchAction.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -80,4 +80,4 @@
             </html:submit>
         </html:form>
     */
-}
\ No newline at end of file
+}
Index: web/struts/src/org/netbeans/modules/web/struts/resources/templates/MappingDispatchAction.template
===================================================================
RCS file: /cvs/web/struts/src/org/netbeans/modules/web/struts/resources/templates/MappingDispatchAction.template,v
retrieving revision 1.4
diff -u -r1.4 MappingDispatchAction.template
--- web/struts/src/org/netbeans/modules/web/struts/resources/templates/MappingDispatchAction.template	29 Jun 2007 14:12:32 -0000	1.4
+++ web/struts/src/org/netbeans/modules/web/struts/resources/templates/MappingDispatchAction.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -34,4 +34,4 @@
         
         return mapping.findForward(SUCCESS);
     }
-}
\ No newline at end of file
+}
Index: web/struts/src/org/netbeans/modules/web/struts/resources/templates/DispatchAction.template
===================================================================
RCS file: /cvs/web/struts/src/org/netbeans/modules/web/struts/resources/templates/DispatchAction.template,v
retrieving revision 1.4
diff -u -r1.4 DispatchAction.template
--- web/struts/src/org/netbeans/modules/web/struts/resources/templates/DispatchAction.template	29 Jun 2007 14:12:32 -0000	1.4
+++ web/struts/src/org/netbeans/modules/web/struts/resources/templates/DispatchAction.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -49,4 +49,4 @@
         
         return mapping.findForward(SUCCESS);
     }
-}
\ No newline at end of file
+}
Index: web/project/src/org/netbeans/modules/web/project/WebTemplateAttributesProvider.java
===================================================================
RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/WebTemplateAttributesProvider.java,v
retrieving revision 1.1
diff -u -r1.1 WebTemplateAttributesProvider.java
--- web/project/src/org/netbeans/modules/web/project/WebTemplateAttributesProvider.java	12 Jun 2007 14:52:07 -0000	1.1
+++ web/project/src/org/netbeans/modules/web/project/WebTemplateAttributesProvider.java	2 Aug 2007 15:21:35 -0000
@@ -52,7 +52,7 @@
         if (license == null) {
             return null;
         } else {
-            return Collections.singletonMap("project", Collections.singletonMap("license", license)); // NOI18N
+            return Collections.singletonMap("project_license", license); // NOI18N
         }
     }
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template,v
retrieving revision 1.4
diff -u -r1.4 ServiceLocator.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template	18 Jun 2007 15:03:36 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template,v
retrieving revision 1.4
diff -u -r1.4 CachingServiceLocator.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template	18 Jun 2007 15:03:36 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template,v
retrieving revision 1.3
diff -u -r1.3 EJB21BmpRemote.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template	18 Jun 2007 15:03:33 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21BmpLocalHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template	18 Jun 2007 15:03:33 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template,v
retrieving revision 1.3
diff -u -r1.3 EJB30SessionLocal.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template	18 Jun 2007 15:03:36 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template,v
retrieving revision 1.3
diff -u -r1.3 EJB30StatelessEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template	18 Jun 2007 15:03:34 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21BmpRemoteHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template	18 Jun 2007 15:03:34 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template,v
retrieving revision 1.3
diff -u -r1.3 EJB30StatefulEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template	18 Jun 2007 15:03:35 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21SessionLocalHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template	18 Jun 2007 15:03:33 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template,v
retrieving revision 1.2
diff -u -r1.2 EJB21CmpPrimaryKey.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template	18 Jun 2007 15:03:34 -0000	1.2
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template,v
retrieving revision 1.3
diff -u -r1.3 EJB21SessionLocal.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template	18 Jun 2007 15:03:33 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template,v
retrieving revision 1.5
diff -u -r1.5 EJB21CmpRemote.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template	18 Jun 2007 15:03:35 -0000	1.5
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template,v
retrieving revision 1.3
diff -u -r1.3 EJB30SessionRemote.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template	18 Jun 2007 15:03:34 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21CmpRemoteHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template	18 Jun 2007 15:03:35 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21CmpLocalHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template	18 Jun 2007 15:03:35 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template,v
retrieving revision 1.3
diff -u -r1.3 EJB21SessionRemote.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template	18 Jun 2007 15:03:35 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template,v
retrieving revision 1.3
diff -u -r1.3 EJB21BmpLocal.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template	18 Jun 2007 15:03:33 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenTopicEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenTopicEjbClass.template,v
retrieving revision 1.4
diff -u -r1.4 EJB30MessageDrivenTopicEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenTopicEjbClass.template	16 Jul 2007 10:28:04 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenTopicEjbClass.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template,v
retrieving revision 1.3
diff -u -r1.3 EJB21MessageDrivenEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template	18 Jun 2007 15:03:35 -0000	1.3
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21SessionRemoteHome.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template	18 Jun 2007 15:03:36 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template	2 Aug 2007 15:21:35 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template,v
retrieving revision 1.4
diff -u -r1.4 EJB21BmpEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template	18 Jun 2007 15:03:35 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template	2 Aug 2007 15:21:36 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenQueueEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenQueueEjbClass.template,v
retrieving revision 1.4
diff -u -r1.4 EJB30MessageDrivenQueueEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenQueueEjbClass.template	16 Jul 2007 10:28:05 -0000	1.4
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenQueueEjbClass.template	2 Aug 2007 15:21:36 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template,v
retrieving revision 1.5
diff -u -r1.5 EJB21SessionEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template	18 Jun 2007 15:03:34 -0000	1.5
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template	2 Aug 2007 15:21:36 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template,v
retrieving revision 1.5
diff -u -r1.5 EJB21CmpLocal.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template	18 Jun 2007 15:03:34 -0000	1.5
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template	2 Aug 2007 15:21:36 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template
===================================================================
RCS file: /cvs/j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template,v
retrieving revision 1.5
diff -u -r1.5 EJB21CmpEjbClass.template
--- j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template	18 Jun 2007 15:03:33 -0000	1.5
+++ j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template	2 Aug 2007 15:36:07 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../../Licenses/license-${project.license}.txt">
+<#include "../../Licenses/license-${project_license}.txt">
 
 package ${package};
 
Index: j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarTemplateAttributesProvider.java
===================================================================
RCS file: /cvs/j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarTemplateAttributesProvider.java,v
retrieving revision 1.1
diff -u -r1.1 EjbJarTemplateAttributesProvider.java
--- j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarTemplateAttributesProvider.java	13 Jun 2007 16:41:50 -0000	1.1
+++ j2ee/ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarTemplateAttributesProvider.java	2 Aug 2007 15:36:08 -0000
@@ -52,7 +52,7 @@
         if (license == null) {
             return null;
         } else {
-            return Collections.singletonMap("project", Collections.singletonMap("license", license)); // NOI18N
+            return Collections.singletonMap("project_license", license); // NOI18N
         }
     }
 
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SETemplateAttributesProvider.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SETemplateAttributesProvider.java,v
retrieving revision 1.2
diff -u -r1.2 J2SETemplateAttributesProvider.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SETemplateAttributesProvider.java	28 Mar 2007 16:05:23 -0000	1.2
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SETemplateAttributesProvider.java	2 Aug 2007 15:36:08 -0000
@@ -52,7 +52,7 @@
         if (license == null) {
             return null;
         } else {
-            return Collections.singletonMap("project", Collections.singletonMap("license", license)); // NOI18N
+            return Collections.singletonMap("project_license", license); // NOI18N
         }
     }
 
Index: java/project/src/org/netbeans/modules/java/project/resources/JApplet.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/JApplet.template,v
retrieving revision 1.3
diff -u -r1.3 JApplet.template
--- java/project/src/org/netbeans/modules/java/project/resources/JApplet.template	11 Jul 2007 08:17:39 -0000	1.3
+++ java/project/src/org/netbeans/modules/java/project/resources/JApplet.template	2 Aug 2007 15:36:08 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Interface.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Interface.template,v
retrieving revision 1.2
diff -u -r1.2 Interface.template
--- java/project/src/org/netbeans/modules/java/project/resources/Interface.template	26 Mar 2007 20:55:42 -0000	1.2
+++ java/project/src/org/netbeans/modules/java/project/resources/Interface.template	2 Aug 2007 15:36:08 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/AnnotationType.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/AnnotationType.template,v
retrieving revision 1.5
diff -u -r1.5 AnnotationType.template
--- java/project/src/org/netbeans/modules/java/project/resources/AnnotationType.template	26 Mar 2007 20:55:40 -0000	1.5
+++ java/project/src/org/netbeans/modules/java/project/resources/AnnotationType.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Enum.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Enum.template,v
retrieving revision 1.5
diff -u -r1.5 Enum.template
--- java/project/src/org/netbeans/modules/java/project/resources/Enum.template	26 Mar 2007 20:55:41 -0000	1.5
+++ java/project/src/org/netbeans/modules/java/project/resources/Enum.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Class.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Class.template,v
retrieving revision 1.3
diff -u -r1.3 Class.template
--- java/project/src/org/netbeans/modules/java/project/resources/Class.template	11 Jul 2007 08:17:39 -0000	1.3
+++ java/project/src/org/netbeans/modules/java/project/resources/Class.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Exception.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Exception.template,v
retrieving revision 1.2
diff -u -r1.2 Exception.template
--- java/project/src/org/netbeans/modules/java/project/resources/Exception.template	26 Mar 2007 20:55:42 -0000	1.2
+++ java/project/src/org/netbeans/modules/java/project/resources/Exception.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Main.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Main.template,v
retrieving revision 1.4
diff -u -r1.4 Main.template
--- java/project/src/org/netbeans/modules/java/project/resources/Main.template	11 Jul 2007 08:17:39 -0000	1.4
+++ java/project/src/org/netbeans/modules/java/project/resources/Main.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/Applet.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/Applet.template,v
retrieving revision 1.2
diff -u -r1.2 Applet.template
--- java/project/src/org/netbeans/modules/java/project/resources/Applet.template	26 Mar 2007 20:55:41 -0000	1.2
+++ java/project/src/org/netbeans/modules/java/project/resources/Applet.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: java/project/src/org/netbeans/modules/java/project/resources/package-info.template
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/resources/package-info.template,v
retrieving revision 1.2
diff -u -r1.2 package-info.template
--- java/project/src/org/netbeans/modules/java/project/resources/package-info.template	26 Mar 2007 20:55:43 -0000	1.2
+++ java/project/src/org/netbeans/modules/java/project/resources/package-info.template	2 Aug 2007 15:36:09 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/main.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/main.rb,v
retrieving revision 1.2
diff -u -r1.2 main.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/main.rb	19 Jul 2007 16:20:55 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/main.rb	2 Aug 2007 15:36:09 -0000
@@ -5,6 +5,6 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 puts "Hello World"
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.rb,v
retrieving revision 1.2
diff -u -r1.2 rakefile.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.rb	19 Jul 2007 16:20:56 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile.rb	2 Aug 2007 15:36:09 -0000
@@ -5,7 +5,7 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 require 'rake'
 require 'rake/testtask'
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/test.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/test.rb,v
retrieving revision 1.2
diff -u -r1.2 test.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/test.rb	19 Jul 2007 16:20:56 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/test.rb	2 Aug 2007 15:36:10 -0000
@@ -5,7 +5,7 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/module.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/module.rb,v
retrieving revision 1.2
diff -u -r1.2 module.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/module.rb	19 Jul 2007 16:20:56 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/module.rb	2 Aug 2007 15:36:10 -0000
@@ -5,7 +5,7 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#assign indent = "">
 <#-- If the "outermodules" parameter is set, emit a series of module Name lines -->
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/class.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/class.rb,v
retrieving revision 1.2
diff -u -r1.2 class.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/class.rb	19 Jul 2007 16:20:56 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/class.rb	2 Aug 2007 15:36:10 -0000
@@ -5,7 +5,7 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#assign indent = "">
 <#-- If the "module" parameter is set, emit a series of module Name lines -->
Index: ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/suite.rb
===================================================================
RCS file: /cvs/ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/suite.rb,v
retrieving revision 1.2
diff -u -r1.2 suite.rb
--- ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/suite.rb	19 Jul 2007 16:20:55 -0000	1.2
+++ ruby/projects/src/org/netbeans/modules/ruby/rubyproject/ui/resources/suite.rb	2 Aug 2007 15:36:10 -0000
@@ -5,7 +5,7 @@
 <#assign licenseFirst = "# ">
 <#assign licensePrefix = "# ">
 <#assign licenseLast = " ">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 require 'test/unit' 
 
Index: mobility/designer2/game/src/org/netbeans/modules/vmd/game/integration/res/emptygame_java.template
===================================================================
RCS file: /cvs/mobility/designer2/game/src/org/netbeans/modules/vmd/game/integration/res/emptygame_java.template,v
retrieving revision 1.3
diff -u -r1.3 emptygame_java.template
--- mobility/designer2/game/src/org/netbeans/modules/vmd/game/integration/res/emptygame_java.template	16 Apr 2007 13:26:41 -0000	1.3
+++ mobility/designer2/game/src/org/netbeans/modules/vmd/game/integration/res/emptygame_java.template	2 Aug 2007 15:36:10 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet_java.template
===================================================================
RCS file: /cvs/mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet_java.template,v
retrieving revision 1.6
diff -u -r1.6 emptyvisualmidlet_java.template
--- mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet_java.template	12 Jul 2007 12:52:23 -0000	1.6
+++ mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualmidlet_java.template	2 Aug 2007 15:36:12 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/hellovisualmidlet_java.template
===================================================================
RCS file: /cvs/mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/hellovisualmidlet_java.template,v
retrieving revision 1.3
diff -u -r1.3 hellovisualmidlet_java.template
--- mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/hellovisualmidlet_java.template	12 Jul 2007 12:52:24 -0000	1.3
+++ mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/hellovisualmidlet_java.template	2 Aug 2007 15:36:13 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign_java.template
===================================================================
RCS file: /cvs/mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign_java.template,v
retrieving revision 1.6
diff -u -r1.6 emptyvisualdesign_java.template
--- mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign_java.template	12 Jul 2007 12:52:24 -0000	1.6
+++ mobility/designer2/midp/src/org/netbeans/modules/vmd/midp/resources/templates/emptyvisualdesign_java.template	2 Aug 2007 15:36:14 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/resources/templates/convertervisualmidlet_java.template
===================================================================
RCS file: /cvs/mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/resources/templates/convertervisualmidlet_java.template,v
retrieving revision 1.3
diff -u -r1.3 convertervisualmidlet_java.template
--- mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/resources/templates/convertervisualmidlet_java.template	17 Jul 2007 08:05:35 -0000	1.3
+++ mobility/designer2/midpconverter/src/org/netbeans/modules/vmd/midp/converter/resources/templates/convertervisualmidlet_java.template	2 Aug 2007 15:36:14 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/LocalizationSupport_java.template
===================================================================
RCS file: /cvs/mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/LocalizationSupport_java.template,v
retrieving revision 1.2
diff -u -r1.2 LocalizationSupport_java.template
--- mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/LocalizationSupport_java.template	26 Jun 2007 13:55:40 -0000	1.2
+++ mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/LocalizationSupport_java.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -435,4 +435,4 @@
      ****   Localization Support End
      ****
      **************************************************************************/    
-}
\ No newline at end of file
+}
Index: mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDlet_java.template
===================================================================
RCS file: /cvs/mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDlet_java.template,v
retrieving revision 1.2
diff -u -r1.2 MIDlet_java.template
--- mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDlet_java.template	26 Jun 2007 13:55:40 -0000	1.2
+++ mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDlet_java.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDPCanvas_java.template
===================================================================
RCS file: /cvs/mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDPCanvas_java.template,v
retrieving revision 1.2
diff -u -r1.2 MIDPCanvas_java.template
--- mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDPCanvas_java.template	26 Jun 2007 13:55:40 -0000	1.2
+++ mobility/project/src/org/netbeans/modules/mobility/project/ui/resources/templates/MIDP/MIDPCanvas_java.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
@@ -76,4 +76,4 @@
     public void commandAction(Command command, Displayable displayable) {
     }
 
-}
\ No newline at end of file
+}
Index: apisupport/project/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
===================================================================
RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java,v
retrieving revision 1.2
diff -u -r1.2 TemplateAttributesProvider.java
--- apisupport/project/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java	25 Apr 2007 16:27:22 -0000	1.2
+++ apisupport/project/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java	2 Aug 2007 15:36:15 -0000
@@ -49,7 +49,7 @@
         if (license == null) {
             return null;
         } else {
-            return Collections.singletonMap("project", Collections.singletonMap("license", license)); // NOI18N
+            return Collections.singletonMap("project_license", license); // NOI18N
         }
     }
 
Index: websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.template
===================================================================
RCS file: /cvs/websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.template,v
retrieving revision 1.2
diff -u -r1.2 MessageHandler.template
--- websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.template	18 Jun 2007 12:30:37 -0000	1.2
+++ websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/MessageHandler.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template
===================================================================
RCS file: /cvs/websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template,v
retrieving revision 1.3
diff -u -r1.3 WebService.template
--- websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template	18 Jun 2007 12:30:36 -0000	1.3
+++ websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.template
===================================================================
RCS file: /cvs/websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.template,v
retrieving revision 1.2
diff -u -r1.2 LogicalHandler.template
--- websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.template	18 Jun 2007 12:30:37 -0000	1.2
+++ websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template
===================================================================
RCS file: /cvs/websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template,v
retrieving revision 1.2
diff -u -r1.2 EjbWebService.template
--- websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template	18 Jun 2007 12:30:37 -0000	1.2
+++ websvc/core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template	2 Aug 2007 15:36:15 -0000
@@ -1,7 +1,7 @@
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
-<#include "../Licenses/license-${project.license}.txt">
+<#include "../Licenses/license-${project_license}.txt">
 
 <#if package?? && package != "">
 package ${package};
Index: projects/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java
===================================================================
RCS file: /cvs/projects/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java,v
retrieving revision 1.2
diff -u -r1.2 ProjectTemplateAttributesProvider.java
--- projects/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java	3 Apr 2007 17:02:20 -0000	1.2
+++ projects/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectTemplateAttributesProvider.java	2 Aug 2007 15:36:15 -0000
@@ -36,8 +36,8 @@
  */
 public final class ProjectTemplateAttributesProvider implements CreateFromTemplateAttributesProvider {
     
-    private static final String ATTR_PROJECT = "project"; // NOI18N
-    private static final String ATTR_LICENSE = "license"; // NOI18N
+    private static final String ATTR_PROJECT_LICENSE = "project_license"; // NOI18N
+    private static final String DEFAULT_LICENSE = "default"; // NOI18N
 
     public Map<String, ? extends Object> attributesFor(
             DataObject template, DataFolder target, String name) {
@@ -60,20 +60,13 @@
     }
     
     private static Map<String, ? extends Object> checkProjectLicense(Map<String, Object> m) {
-        Object prjAttrObj = m != null? m.get(ATTR_PROJECT): null;
-        Map<String, Object> newMap = null;
-        if (prjAttrObj instanceof Map) {
-            Map prjAttrs = (Map) prjAttrObj;
-            if (prjAttrs.get(ATTR_LICENSE) != null) {
-                return m;
-            }
-        } else if (prjAttrObj != null) {
-            return m;
-        } else {
-            newMap = new HashMap<String, Object>();
+        if (m == null) {
+            return Collections.singletonMap(ATTR_PROJECT_LICENSE, DEFAULT_LICENSE);
+        }
+        if (!m.containsKey(ATTR_PROJECT_LICENSE)) {
+            m.put(ATTR_PROJECT_LICENSE, DEFAULT_LICENSE);
         }
-        newMap.put(ATTR_PROJECT, Collections.<String, String>singletonMap(ATTR_LICENSE, "default")); // NOI18N
-        return newMap;
+        return m;
     }
     
 }
Index: projects/projectuiapi/apichanges.xml
===================================================================
RCS file: /cvs/projects/projectuiapi/apichanges.xml,v
retrieving revision 1.32
diff -u -r1.32 apichanges.xml
--- projects/projectuiapi/apichanges.xml	10 May 2007 07:54:56 -0000	1.32
+++ projects/projectuiapi/apichanges.xml	2 Aug 2007 15:36:15 -0000
@@ -98,13 +98,13 @@
         </change>
         <change id="project-license-property">
             <api name="general"/>
-            <summary>Adding template attribute <code>project.license</code></summary>
+            <summary>Adding template attribute <code>project_license</code></summary>
             <version major="1" minor="23"/>
             <date day="26" month="3" year="2007"/>
             <author login="jpokorsky"/>
             <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
             <description>
-                Added the template attribute <code>project.license</code> for templates using scripting language.
+                Added the template attribute <code>project_license</code> for templates using scripting language.
             </description>
             <issue number="95399"/>
         </change>
Index: projects/projectuiapi/arch.xml
===================================================================
RCS file: /cvs/projects/projectuiapi/arch.xml,v
retrieving revision 1.18
diff -u -r1.18 arch.xml
--- projects/projectuiapi/arch.xml	28 Mar 2007 14:34:45 -0000	1.18
+++ projects/projectuiapi/arch.xml	2 Aug 2007 15:36:16 -0000
@@ -665,12 +665,12 @@
        <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.
+       <a href="#property-project_license">project_license</a> attribute for file templates using scripting support.
      </api>
   </p>
    <p>
-     <api group="property" name="project.license" type="export" category="official">
-       <code>project.license</code> attribute contains project license as <code>String</code> for newly created
+     <api group="property" name="project_license" type="export" category="official">
+       <code>project_license</code> attribute contains project license as <code>String</code> for newly created
        <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